From dad7c7162bddfad0aa60648042f9a7f0d1255ee5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 17 Jul 2010 17:25:32 -0400 Subject: * lisp/dired.el (dired-buffers-for-dir): Handle list values of dired-directory (Bug#6636). --- lisp/ChangeLog | 5 +++++ lisp/dired.el | 38 ++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 18 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ce0e8e3073..2ce2201f34b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-07-17 Chong Yidong + + * dired.el (dired-buffers-for-dir): Handle list values of + dired-directory (Bug#6636). + 2010-07-16 Reiner Steib * vc.el (vc-coding-system-inherit-eol): New defvar. diff --git a/lisp/dired.el b/lisp/dired.el index c3d1435401e..4a23865dfca 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2227,31 +2227,33 @@ You can then feed the file name(s) to other commands with \\[yank]." ;; Keeping Dired buffers in sync with the filesystem and with each other (defun dired-buffers-for-dir (dir &optional file) -;; Return a list of buffers that dired DIR (top level or in-situ subdir). +;; Return a list of buffers for DIR (top level or in-situ subdir). ;; If FILE is non-nil, include only those whose wildcard pattern (if any) ;; matches FILE. ;; The list is in reverse order of buffer creation, most recent last. ;; As a side effect, killed dired buffers for DIR are removed from ;; dired-buffers. (setq dir (file-name-as-directory dir)) - (let ((alist dired-buffers) result elt buf) - (while alist - (setq elt (car alist) - buf (cdr elt)) - (if (buffer-name buf) - (if (dired-in-this-tree dir (car elt)) - (with-current-buffer buf - (and (assoc dir dired-subdir-alist) - (or (null file) - (let ((wildcards - (file-name-nondirectory dired-directory))) - (or (= 0 (length wildcards)) - (string-match (dired-glob-regexp wildcards) - file)))) - (setq result (cons buf result))))) - ;; else buffer is killed - clean up: + (let (result buf) + (dolist (elt dired-buffers) + (setq buf (cdr elt)) + (cond + ((null (buffer-name buf)) + ;; Buffer is killed - clean up: (setq dired-buffers (delq elt dired-buffers))) - (setq alist (cdr alist))) + ((dired-in-this-tree dir (car elt)) + (with-current-buffer buf + (and (assoc dir dired-subdir-alist) + (or (null file) + (if (stringp dired-directory) + (let ((wildcards (file-name-nondirectory + dired-directory))) + (or (= 0 (length wildcards)) + (string-match (dired-glob-regexp wildcards) + file))) + (member (expand-file-name file dir) + (cdr dired-directory)))) + (setq result (cons buf result))))))) result)) (defun dired-glob-regexp (pattern) -- cgit v1.2.1 From c9088194ea32fafd6371a33e63c45bcc15cbb8aa Mon Sep 17 00:00:00 2001 From: Shyam Karanatt Date: Sat, 17 Jul 2010 17:51:04 -0400 Subject: Fix size calculation for sliced images in image-mode (Bug#6639). * lisp/image-mode.el (image-display-size): New function. (image-forward-hscroll, image-next-line, image-eol, image-eob) (image-mode-fit-frame): Use it (Bug#6639). --- lisp/ChangeLog | 6 ++++++ lisp/image-mode.el | 34 ++++++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 6 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ce2201f34b..b0dbe931e9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-07-17 Shyam Karanatt (tiny change) + + * image-mode.el (image-display-size): New function. + (image-forward-hscroll, image-next-line, image-eol, image-eob) + (image-mode-fit-frame): Use it (Bug#6639). + 2010-07-17 Chong Yidong * dired.el (dired-buffers-for-dir): Handle list values of diff --git a/lisp/image-mode.el b/lisp/image-mode.el index a9736541a4f..7143d9833c0 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -128,6 +128,28 @@ A winprops object has the shape (WINDOW . ALIST)." (declare-function image-size "image.c" (spec &optional pixels frame)) +(defun image-display-size (spec &optional pixels frame) + "Wrapper around `image-size', to handle slice display properties. +If SPEC is an image display property, call `image-size' with the +given arguments. +If SPEC is a list of properties containing `image' and `slice' +properties, calculate the display size from the slice property. +If SPEC contains `image' but not `slice', call `image-size' with +the specified image." + (if (eq (car spec) 'image) + (image-size spec pixels frame) + (let ((image (assoc 'image spec)) + (slice (assoc 'slice spec))) + (cond ((and image slice) + (if pixels + (cons (nth 3 slice) (nth 4 slice)) + (cons (/ (float (nth 3 slice)) (frame-char-width frame)) + (/ (float (nth 4 slice)) (frame-char-height frame))))) + (image + (image-size image pixels frame)) + (t + (error "Invalid image specification: %s" spec)))))) + (defun image-forward-hscroll (&optional n) "Scroll image in current window to the left by N character widths. Stop if the right edge of the image is reached." @@ -139,7 +161,7 @@ Stop if the right edge of the image is reached." (let* ((image (image-get-display-property)) (edges (window-inside-edges)) (win-width (- (nth 2 edges) (nth 0 edges))) - (img-width (ceiling (car (image-size image))))) + (img-width (ceiling (car (image-display-size image))))) (image-set-window-hscroll (min (max 0 (- img-width win-width)) (+ n (window-hscroll)))))))) @@ -160,7 +182,7 @@ Stop if the bottom edge of the image is reached." (let* ((image (image-get-display-property)) (edges (window-inside-edges)) (win-height (- (nth 3 edges) (nth 1 edges))) - (img-height (ceiling (cdr (image-size image))))) + (img-height (ceiling (cdr (image-display-size image))))) (image-set-window-vscroll (min (max 0 (- img-height win-height)) (+ n (window-vscroll)))))))) @@ -233,7 +255,7 @@ stopping if the top or bottom edge of the image is reached." (let* ((image (image-get-display-property)) (edges (window-inside-edges)) (win-width (- (nth 2 edges) (nth 0 edges))) - (img-width (ceiling (car (image-size image))))) + (img-width (ceiling (car (image-display-size image))))) (image-set-window-hscroll (max 0 (- img-width win-width))))) (defun image-bob () @@ -248,9 +270,9 @@ stopping if the top or bottom edge of the image is reached." (let* ((image (image-get-display-property)) (edges (window-inside-edges)) (win-width (- (nth 2 edges) (nth 0 edges))) - (img-width (ceiling (car (image-size image)))) + (img-width (ceiling (car (image-display-size image)))) (win-height (- (nth 3 edges) (nth 1 edges))) - (img-height (ceiling (cdr (image-size image))))) + (img-height (ceiling (cdr (image-display-size image))))) (image-set-window-hscroll (max 0 (- img-width win-width))) (image-set-window-vscroll (max 0 (- img-height win-height))))) @@ -264,7 +286,7 @@ This function assumes the current frame has only one window." (interactive) (let* ((saved (frame-parameter nil 'image-mode-saved-size)) (display (image-get-display-property)) - (size (image-size display))) + (size (image-display-size display))) (if (and saved (eq (caar saved) (frame-width)) (eq (cdar saved) (frame-height))) -- cgit v1.2.1 From e72b6fa4b2323c27af49e790e8f20a33be51559b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 17 Jul 2010 17:57:06 -0400 Subject: Doc fix to commentary (Bug#6653). --- lisp/progmodes/compile.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 6bb31ca5cc4..c8f9834cf64 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -47,7 +47,7 @@ ;; using the same *compilation* buffer. this necessitates re-parsing markers. ;; FILE-STRUCTURE is a list of -;; ((FILENAME . DIRECTORY) FORMATS (LINE LOC ...) ...) +;; ((FILENAME DIRECTORY) FORMATS (LINE LOC ...) ...) ;; FILENAME is a string parsed from an error message. DIRECTORY is a string ;; obtained by following directory change messages. DIRECTORY will be nil for -- cgit v1.2.1 From 7c7c04c037f2280f01f7e088b6f7b491d0d0f150 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 19 Jul 2010 12:42:22 +0200 Subject: * time.el (display-time-day-and-date): Remove spurious * in docstring. (display-time-world-buffer-name, display-time-world-mode-map): Fix typos in docstrings. --- lisp/ChangeLog | 6 ++++++ lisp/time.el | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0dbe931e9f..05f72778b4f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-07-19 Juanma Barranquero + + * time.el (display-time-day-and-date): Remove spurious * in docstring. + (display-time-world-buffer-name, display-time-world-mode-map): + Fix typos in docstrings. + 2010-07-17 Shyam Karanatt (tiny change) * image-mode.el (image-display-size): New function. diff --git a/lisp/time.el b/lisp/time.el index 5c3456e9c59..302a8c7cd73 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -87,7 +87,7 @@ The value can be one of: ;;;###autoload (defcustom display-time-day-and-date nil "\ -*Non-nil means \\[display-time] should display day and date as well as time." +Non-nil means \\[display-time] should display day and date as well as time." :type 'boolean :group 'display-time) @@ -182,7 +182,7 @@ LABEL is a string to display as the label of that TIMEZONE's time." :version "23.1") (defcustom display-time-world-buffer-name "*wclock*" - "Name of the wclock buffer." + "Name of the world clock buffer." :group 'display-time :type 'string :version "23.1") @@ -203,7 +203,7 @@ LABEL is a string to display as the label of that TIMEZONE's time." (let ((map (make-sparse-keymap))) (define-key map "q" 'kill-this-buffer) map) - "Keymap of Display Time World mode") + "Keymap of Display Time World mode.") ;;;###autoload (defun display-time () -- cgit v1.2.1 From 604f7ca6ec1d91a13a77f7338c1866d23e5434dd Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 20 Jul 2010 02:04:31 +0200 Subject: * cedet/semantic/db-file.el (object-write): Fix typo in docstring. --- lisp/ChangeLog | 4 ++++ lisp/cedet/semantic/db-file.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05f72778b4f..96a55e15dd5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-07-20 Juanma Barranquero + + * cedet/semantic/db-file.el (object-write): Fix typo in docstring. + 2010-07-19 Juanma Barranquero * time.el (display-time-day-and-date): Remove spurious * in docstring. diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 85b0d75338d..95d634920b5 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -277,7 +277,7 @@ to prevent overload.") (defmethod object-write ((obj semanticdb-table)) "When writing a table, we have to make sure we deoverlay it first. -Restore the overlays after writting. +Restore the overlays after writing. Argument OBJ is the object to write." (when (semanticdb-live-p obj) (when (semanticdb-in-buffer-p obj) -- cgit v1.2.1 From a096f9fe86081bdd4b572020531f10c79f3b2c25 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 21 Jul 2010 13:31:22 +0200 Subject: lisp/mail/rmail.el: Update autoload checksum. --- lisp/mail/rmail.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 630c729703b..fbf5c534a28 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4291,7 +4291,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "93033f2136fcd111e2b52a116ff4cf29") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "4a7502b4aeb3bd5f2111b48cc6512924") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ -- cgit v1.2.1 From fe4be04c37fe73fa966ca66bd6be42c898c004ac Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 23 Jul 2010 03:51:48 +0200 Subject: * help-fns.el (find-lisp-object-file-name): Doc fix (bug#6494). --- lisp/ChangeLog | 4 ++++ lisp/help-fns.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96a55e15dd5..670f07c2683 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-07-23 Juanma Barranquero + + * help-fns.el (find-lisp-object-file-name): Doc fix (bug#6494). + 2010-07-20 Juanma Barranquero * cedet/semantic/db-file.el (object-write): Fix typo in docstring. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 86e9411b140..18db4f443f6 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -231,8 +231,8 @@ if the variable `help-downcase-arguments' is non-nil." "Guess the file that defined the Lisp object OBJECT, of type TYPE. OBJECT should be a symbol associated with a function, variable, or face; alternatively, it can be a function definition. -If TYPE is `variable', search for a variable definition. -If TYPE is `face', search for a face definition. +If TYPE is `defvar', search for a variable definition. +If TYPE is `defface', search for a face definition. If TYPE is the value returned by `symbol-function' for a function symbol, search for a function definition. -- cgit v1.2.1 From 4ac3a65cf109e66549fea3d07202404ce4834ab6 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 25 Jul 2010 13:36:02 +0200 Subject: * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717) --- lisp/url/ChangeLog | 4 ++++ lisp/url/url-http.el | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'lisp') diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 790a7a9affa..8fe26f58833 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2010-07-25 Michael Albinus + + * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717) + 2010-06-12 Štěpán Němec (tiny change) * url-vars.el (url-privacy-level): Fix doc typo. (Bug#6406) diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 8c203c0eb87..b9aba9f37c9 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -435,7 +435,10 @@ should be shown to the user." (delete-process url-http-process))))) (let ((buffer (current-buffer)) (class nil) - (success nil)) + (success nil) + ;; The filename part of a URL could be in remote file syntax, + ;; see Bug#6717 for an example. We disable Tramp, therefore. + (tramp-mode nil)) (setq class (/ url-http-response-status 100)) (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status) (url-http-handle-cookies) -- cgit v1.2.1 From c48763bb7905a61e2fbd55db105b076fd4a06588 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 26 Jul 2010 15:19:32 +0200 Subject: * url-http (url-http-parse-headers): Disable file name handlers at all (not only Tramp). (Bug#6717) --- lisp/url/ChangeLog | 5 +++++ lisp/url/url-http.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 8fe26f58833..f7babefc876 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2010-07-26 Michael Albinus + + * url-http (url-http-parse-headers): Disable file name handlers at + all (not only Tramp). (Bug#6717) + 2010-07-25 Michael Albinus * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717) diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index b9aba9f37c9..00cfa46ea18 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -437,8 +437,9 @@ should be shown to the user." (class nil) (success nil) ;; The filename part of a URL could be in remote file syntax, - ;; see Bug#6717 for an example. We disable Tramp, therefore. - (tramp-mode nil)) + ;; see Bug#6717 for an example. We disable file name + ;; handlers, therefore. + (file-name-handler-alist nil)) (setq class (/ url-http-response-status 100)) (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status) (url-http-handle-cookies) -- cgit v1.2.1