From: Stefan Monnier Date: Tue, 23 Oct 2001 22:01:17 +0000 (+0000) Subject: (uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0). X-Git-Tag: ttn-vms-21-2-B4~19220 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e07777e6d6b27ec3ac88d5f5b2b8e4b8b6ae49d4;p=emacs.git (uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 86e501c72a1..dc61cb8a8de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,11 +1,13 @@ 2001-10-23 Stefan Monnier + * uniquify.el (uniquify-get-proposed-name): Fix (.. "usr" "/usr" 0). + * progmodes/compile.el (compile-mouse-goto-error, compile-goto-error): Turn caadr into caar of cdr. 2001-10-23 Gerd Moellmann - * info.el (Info-fontify-node): Bind doun-mouse-{1,2} instead + * info.el (Info-fontify-node): Bind down-mouse-{1,2} instead of mouse-{1,2} since dragging is on the down event. * play/doctor.el (make-doctor-variables): Remove a '($ please)'. @@ -19,8 +21,8 @@ 2001-10-22 Gerd Moellmann - * progmodes/compile.el (compilation-set-window-height): Select - old window only if it's still live. + * progmodes/compile.el (compilation-set-window-height): + Select old window only if it's still live. 2001-10-22 Pavel Jan,Bm(Bk @@ -29,8 +31,8 @@ 2001-10-22 Eli Zaretskii - * files.el (file-name-sans-extension, file-name-extension): Don't - count the leading dots in file names as signaling an extension. + * files.el (file-name-sans-extension, file-name-extension): + Don't count the leading dots in file names as signaling an extension. 2001-10-22 Andre Spiegel @@ -51,8 +53,7 @@ * tooltip.el (tooltip-x-offset, tooltip-y-offset): Mention in the doc string the effect of `left' and `top' parameters in tooltip-frame-parameters, the default values, and the units. - (tooltip-frame-parameters): Mention `top' and `left' in the doc - string. + (tooltip-frame-parameters): Mention `top' and `left' in the doc string. (tooltip-show): Mention in the doc string the `top' and `left' parameters in tooltip-frame-parameters, and x-max-tooltip-size. @@ -60,14 +61,13 @@ Add autoscaling support for vc-annotate. From J.D. Smith . - + * vc.el (vc-annotate-display-default): Accept colormap scaling ratio (now deprecated). (vc-annotate-display-autoscale): Added. (vc-annotate-add-menu): New autoscaling menu options "Span to Oldest" and "Span Oldest->Newest". Easymenu support added for - toggle menus driven by customize variable - `vc-annotate-display-mode'. + toggle menus driven by customize variable `vc-annotate-display-mode'. (vc-annotate-display-select): Added. (vc-annotate): Changed temp-buffer-show-function to `vc-annotate-display-select'. @@ -80,7 +80,7 @@ (vc-default-annotate-current-time): Added. * vc-cvs.el (vc-cvs-annotate-difference): Removed to generic - version in vc.el, with + version in vc.el, with (vc-cvs-annotate-current-time): Added, as override of default. (vc-cvs-annotate-time) Added. Taken mostly from the (now removed) `vc-cvs-annotate-difference'. @@ -89,7 +89,7 @@ * saveplace.el (save-place): Require `saveplace'. - * progmodes/cwarn.el (cwarn-font-lock-feature-keywords-alist): + * progmodes/cwarn.el (cwarn-font-lock-feature-keywords-alist): Use `sexp' for :value-type instead of `face'. 2001-10-21 Eli Zaretskii @@ -117,15 +117,15 @@ 2001-10-21 Andre Spiegel - * vc.el (vc-diff-internal, vc-coding-system-for-diff, - vc-default-diff-tree): New functions. + * vc.el (vc-diff-internal, vc-coding-system-for-diff) + (vc-default-diff-tree): New functions. (vc-version-diff): Use them. As a result, coding systems are now set up properly for all sorts of diffs, and tree diffs can now also be done locally. (vc-diff): With a prefix argument, don't require that it's called from a buffer under version control. (diff-switches): Remove duplicate definition. - + * vc-cvs.el (vc-cvs-diff-tree): New function. 2001-10-21 Miles Bader @@ -151,15 +151,14 @@ 2001-10-19 Eli Zaretskii * files.el (auto-mode-alist): Associate .indent.pro with - Fundamental mode. Suggested by Samuel Padgett - . + Fundamental mode. Suggested by Samuel Padgett . 2001-10-18 Sam Steingold Put the *Compile-Log* buffer in `compilation-mode'. * emacs-lisp/bytecomp.el (byte-goto-log-buffer): New function. (byte-compile-log-1, byte-compile-log-file) - (displaying-byte-compile-warnings): use it + (displaying-byte-compile-warnings): Use it 2001-10-18 Stefan Monnier diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 361fae2ea17..cd8b22303dc 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -279,7 +279,7 @@ in `uniquify-list-buffers-directory-modes', otherwise returns nil." file) extra-string))) (when (zerop n) - (if (and filename + (if (and filename extra-string (setq filename (file-name-directory filename)) (equal filename (file-name-directory (directory-file-name filename))))