From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Sun, 31 Jan 2010 20:31:31 -0800 (PST) Message-ID: <201002010431.o114VVFL017957@godzilla.ics.uci.edu> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> <87eilat62r.fsf@telefonica.net> <83eilat4g7.fsf@gnu.org> <873a1qt32z.fsf@telefonica.net> <83aavyt0bt.fsf@gnu.org> <201001290200.o0T200xh010567@godzilla.ics.uci.edu> <83y6jhs2b6.fsf@gnu.org> <201001290940.o0T9e0br025585@godzilla.ics.uci.edu> <87r5p9rxun.fsf@telefonica.net> <83vdelrx60.fsf@gnu.org> <201001291729.o0THTFam010863@godzilla.ics.uci.edu> <87ljfgdatj.fsf@telefonica.net> <83d40ssn0g.fsf@gnu.org> <201001301949.o0UJnBmA002547@godzilla.ics.uci.edu> <87ockbi4js.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264998896 31872 80.91.229.12 (1 Feb 2010 04:34:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Feb 2010 04:34:56 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , Eli Zaretskii , emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 01 05:34:53 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Nbnzu-0004Oj-Md for ged-emacs-devel@m.gmane.org; Mon, 01 Feb 2010 05:34:51 +0100 Original-Received: from localhost ([127.0.0.1]:34238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nbnzu-0004wV-1p for ged-emacs-devel@m.gmane.org; Sun, 31 Jan 2010 23:34:50 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nbnzo-0004w6-EA for emacs-devel@gnu.org; Sun, 31 Jan 2010 23:34:44 -0500 Original-Received: from [199.232.76.173] (port=43828 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nbnzo-0004vy-4Q for emacs-devel@gnu.org; Sun, 31 Jan 2010 23:34:44 -0500 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nbnzl-0002z3-7Q for emacs-devel@gnu.org; Sun, 31 Jan 2010 23:34:43 -0500 Original-Received: from colin-baker-v0.ics.uci.edu ([128.195.1.153]:55717) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Nbnzk-0002Zx-0a; Sun, 31 Jan 2010 23:34:40 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by colin-baker-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id o114VVm5031529 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 31 Jan 2010 20:31:31 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id o114VVFL017957; Sun, 31 Jan 2010 20:31:31 -0800 (PST) In-Reply-To: <87ockbi4js.fsf@mail.jurta.org> (Juri Linkov's message of "Sun, 31 Jan 2010 00:54:59 +0200") Original-Lines: 34 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: o114VVm5031529 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120767 Archived-At: Juri Linkov writes: > > (when pending-merge > > (concat > > (propertize "Warning : " 'face 'font-lock-warning-face > > 'help-echo shelve-help-echo) > > (propertize "Pending merges, commit recommended before any other action" > > 'help-echo (format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir) > > 'face 'font-lock-warning-face) > > "\n")) > > (if shelve > > (concat > > (propertize "Shelves :\n" 'face 'font-lock-type-face > > 'help-echo shelve-help-echo) > > (mapconcat > > (lambda (x) > > (propertize x > > 'face 'font-lock-variable-name-face > > 'mouse-face 'highlight > > 'help-echo "mouse-3: Show shelve menu\nA: Apply and keep shelf\nP: Apply and remove shelf (pop)\nS: Snapshot to a shelf\nC-k: Delete shelf" > > 'keymap vc-bzr-shelve-map)) > > shelve "\n")) > > (concat > > (propertize "Shelves : " 'face 'font-lock-type-face > > 'help-echo shelve-help-echo) > > (propertize "No shelved changes" > > 'help-echo shelve-help-echo > > 'face 'font-lock-variable-name-face)))))) > > I recommend to not display inactive features because "No shelved changes" > adds more noise as there will be no "No pending merges". It's not inactive, it has a tooltip, and the plan is that it will get a menu and probably some buttons to create a shelf and put a snapshot on a shelf.