From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] emacs/lisp ChangeLog bookmark.el Date: Fri, 21 Nov 2008 14:38:50 -0500 Message-ID: <87hc606f91.fsf@red-bean.com> References: Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1227296355 31641 80.91.229.12 (21 Nov 2008 19:39:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Nov 2008 19:39:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 21 20:40:18 2008 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.50) id 1L3brP-0003Vm-I4 for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2008 20:40:12 +0100 Original-Received: from localhost ([127.0.0.1]:33451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3bqG-00015e-GN for ged-emacs-devel@m.gmane.org; Fri, 21 Nov 2008 14:39:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3bqA-00014x-Sm for emacs-devel@gnu.org; Fri, 21 Nov 2008 14:38:55 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3bq8-00014J-VE for emacs-devel@gnu.org; Fri, 21 Nov 2008 14:38:53 -0500 Original-Received: from [199.232.76.173] (port=35018 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3bq8-00014C-QZ for emacs-devel@gnu.org; Fri, 21 Nov 2008 14:38:52 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.193.61]:55512) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L3bq8-0003bg-Al for emacs-devel@gnu.org; Fri, 21 Nov 2008 14:38:52 -0500 Original-Received: from localhost ([127.0.0.1]:40428 helo=floss ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.69) (envelope-from ) id 1L3bq6-0001D6-Th; Fri, 21 Nov 2008 13:38:51 -0600 In-Reply-To: (Stefan Monnier's message of "Fri, 21 Nov 2008 19:07:24 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) 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:105908 Archived-At: Stefan Monnier writes: > Log message: > (bookmark-buffer-file-name): Also abbreviate dired-dir. > Suggested by Toru TSUNEYOSHI. I don't think this change hurts anything, but I'm also not sure it's necessary. See my response to Toru Tsuneyoshi just now: http://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00668.html > Index: ChangeLog > =================================================================== > RCS file: /sources/emacs/emacs/lisp/ChangeLog,v > retrieving revision 1.14822 > retrieving revision 1.14823 > diff -u -b -r1.14822 -r1.14823 > --- ChangeLog 21 Nov 2008 18:51:19 -0000 1.14822 > +++ ChangeLog 21 Nov 2008 19:07:21 -0000 1.14823 > @@ -1,15 +1,20 @@ > +2008-11-21 Stefan Monnier > + > + * bookmark.el (bookmark-buffer-file-name): Also abbreviate dired-dir. > + Suggested by Toru TSUNEYOSHI. > + ...also, it looks like a bunch of unrelated tweaks to the ChangeLog got committed in this same change... > 2008-11-21 Shigeru Fukaya > > * byte-opt.el (byte-compile-butlast): Move up in file. > (byte-optimize-plus): Don't call > - byte-optimize-delay-constants-math (bug#1334). Use > - byte-optimize-predicate to optimize constants. > + byte-optimize-delay-constants-math (bug#1334). > + Use byte-optimize-predicate to optimize constants. > (byte-optimize-minus): Don't call > byte-optimize-delay-constants-math. Remove zero arguments first > if possible. Call byte-optimize-predicate to optimize constants. > (byte-optimize-multiply): Remove optimizations for arguments of 0 > - and 2, which may be inaccurate. Optimize (* x -1) to (- x). Call > - byte-optimize-predicate. > + and 2, which may be inaccurate. Optimize (* x -1) to (- x). > + Call byte-optimize-predicate. > (byte-optimize-divide): Leave runtime errors unchanged. > Optimize (/ x 1) to (+ x 0). Remove optimizations for arguments of > 0 and 2.0, which may be inaccurate. Call byte-optimize-predicate. > @@ -275,8 +280,7 @@ > > 2008-11-16 Chong Yidong > > - * subr.el (read-passwd): Use read-event instead of > - read-char-exclusive. > + * subr.el (read-passwd): Use read-event instead of read-char-exclusive. > > 2008-11-16 Stefan Monnier > > @@ -368,7 +372,7 @@ > * emulation/viper-init.el (viper-ESC-keyseq-timeout): Make it into a > function instead of a variable. > > - * emulation/viper-util.el (viper-fast-keysequence-p): Changed to use > + * emulation/viper-util.el (viper-fast-keysequence-p): Change to use > viper-ESC-keyseq-timeout as a function. > (viper-get-saved-cursor-color-in-replace-mode): Use defun instead of > defsubst. > @@ -13611,8 +13615,8 @@ > > 2008-03-01 Glenn Morris > > - * emacs-lisp/bytecomp.el (byte-compile-maybe-guarded): Restore > - code commented out 2007-11-10. > + * emacs-lisp/bytecomp.el (byte-compile-maybe-guarded): > + Restore code commented out 2007-11-10. > > * emulation/edt.el (zmacs-region-stays): Define for compiler once only. ...anyway, here's the bookmark.el diff: > Index: bookmark.el > =================================================================== > RCS file: /sources/emacs/emacs/lisp/bookmark.el,v > retrieving revision 1.120 > retrieving revision 1.121 > diff -u -b -r1.120 -r1.121 > --- bookmark.el 21 Nov 2008 10:32:41 -0000 1.120 > +++ bookmark.el 21 Nov 2008 19:07:24 -0000 1.121 > @@ -888,17 +888,17 @@ > > (defun bookmark-buffer-file-name () > "Return the current buffer's file in a way useful for bookmarks." > - (cond > - (buffer-file-name > ;; Abbreviate the path, both so it's shorter and so it's more > ;; portable. E.g., the user's home dir might be a different > ;; path on different machines, but "~/" will still reach it. > - (abbreviate-file-name buffer-file-name)) > + (abbreviate-file-name > + (cond > + (buffer-file-name buffer-file-name) > ((and (boundp 'dired-directory) dired-directory) > (if (stringp dired-directory) > dired-directory > (car dired-directory))) > - (t (error "Buffer not visiting a file or directory")))) > + (t (error "Buffer not visiting a file or directory"))))) > > > (defun bookmark-maybe-load-default-file () Looks like you made exactly the same patch I posted in my mail. That's a good sign, I guess :-). -Karl