Re: [Emacs-diffs] emacs/lisp ChangeLog bookmark.el

[Karl Fogel]

Stefan Monnier <address@hidden> 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  <address@hidden>
> +
> +     * 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  <address@hidden>
>  
>       * 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  <address@hidden>
>  
> -     * 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  <address@hidden>
>  
> @@ -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  <address@hidden>
>  
> -     * 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