# HG changeset patch # User Juanma Barranquero # Date 1280196605 -7200 # Node ID a4b9fa0b861b64a307a2b155a055fb4f937dc0b3 # Parent 9eac3b0c288414bbb8ee14b39b58c938701b4c10# Parent 3241579568b96d87229cf4705d68381b05dfc9d6 Merge from emacs-23 diff -r 9eac3b0c2884 -r a4b9fa0b861b doc/lispref/ChangeLog --- a/doc/lispref/ChangeLog Mon Jul 26 15:05:47 2010 -0400 +++ b/doc/lispref/ChangeLog Tue Jul 27 04:10:05 2010 +0200 @@ -1,3 +1,10 @@ +2010-07-27 Juanma Barranquero + + * modes.texi (Defining Minor Modes): Use C-delete in examples, + instead of "\C-\^?" (bug#6334). + + * text.texi (Special Properties): Fix typo. + 2010-07-09 Eli Zaretskii * internals.texi (Writing Emacs Primitives): Adapt to ANSI C diff -r 9eac3b0c2884 -r a4b9fa0b861b doc/lispref/modes.texi --- a/doc/lispref/modes.texi Mon Jul 26 15:05:47 2010 -0400 +++ b/doc/lispref/modes.texi Tue Jul 27 04:10:05 2010 +0200 @@ -1494,7 +1494,7 @@ ;; The indicator for the mode line. " Hungry" ;; The minor mode bindings. - '(("\C-\^?" . hungry-electric-delete)) + '(([C-delete] . hungry-electric-delete)) :group 'hunger) @end smallexample @@ -1526,8 +1526,8 @@ :lighter " Hungry" ;; The minor mode bindings. :keymap - '(("\C-\^?" . hungry-electric-delete) - ("\C-\M-\^?" + '(([C-delete] . hungry-electric-delete) + ([C-M-delete] . (lambda () (interactive) (hungry-electric-delete t)))) diff -r 9eac3b0c2884 -r a4b9fa0b861b doc/lispref/text.texi --- a/doc/lispref/text.texi Mon Jul 26 15:05:47 2010 -0400 +++ b/doc/lispref/text.texi Tue Jul 27 04:10:05 2010 +0200 @@ -3035,7 +3035,7 @@ property when Font Lock mode is enabled. When Font Lock mode is disabled, @code{font-lock-face} has no effect. -The @code{font-lock-mode} property is useful for special modes that +The @code{font-lock-face} property is useful for special modes that implement their own highlighting. @xref{Precalculated Fontification}. @item mouse-face diff -r 9eac3b0c2884 -r a4b9fa0b861b doc/misc/ChangeLog --- a/doc/misc/ChangeLog Mon Jul 26 15:05:47 2010 -0400 +++ b/doc/misc/ChangeLog Tue Jul 27 04:10:05 2010 +0200 @@ -1,3 +1,7 @@ +2010-07-27 Chong Yidong + + * nxml-mode.texi (Limitations): Remove obsolete discussion (Bug#6708). + 2010-07-19 Juanma Barranquero * org.texi: Fix typo in previous change (revno:100847). diff -r 9eac3b0c2884 -r a4b9fa0b861b doc/misc/nxml-mode.texi --- a/doc/misc/nxml-mode.texi Mon Jul 26 15:05:47 2010 -0400 +++ b/doc/misc/nxml-mode.texi Tue Jul 27 04:10:05 2010 +0200 @@ -851,11 +851,6 @@ @item The restrictions on RELAX NG schemas in section 7 of the RELAX NG specification are not enforced. -@item -Unicode support has problems. This stems mostly from the fact that -the XML (and RELAX NG) character model is based squarely on Unicode, -whereas the Emacs character model is not. Emacs 22 is slated to have -full Unicode support, which should improve the situation here. @end itemize @bye diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/ChangeLog --- a/lisp/ChangeLog Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/ChangeLog Tue Jul 27 04:10:05 2010 +0200 @@ -1,3 +1,24 @@ +2010-07-27 Juanma Barranquero + + * help-fns.el (find-lisp-object-file-name): Doc fix (bug#6494). + + * cedet/semantic/db-file.el (object-write): Fix typo in docstring. + + * 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-27 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-27 Chong Yidong + + * dired.el (dired-buffers-for-dir): Handle list values of + dired-directory (Bug#6636). + 2010-07-26 Sam Steingold * mouse.el (mouse-yank-primary, mouse-yank-secondary): diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/cedet/semantic/db-file.el --- a/lisp/cedet/semantic/db-file.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/cedet/semantic/db-file.el Tue Jul 27 04:10:05 2010 +0200 @@ -277,7 +277,7 @@ (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) diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/dired.el --- a/lisp/dired.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/dired.el Tue Jul 27 04:10:05 2010 +0200 @@ -2225,31 +2225,33 @@ ;; 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) diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/help-fns.el --- a/lisp/help-fns.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/help-fns.el Tue Jul 27 04:10:05 2010 +0200 @@ -231,8 +231,8 @@ "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. diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/image-mode.el --- a/lisp/image-mode.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/image-mode.el Tue Jul 27 04:10:05 2010 +0200 @@ -128,6 +128,28 @@ (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 @@ (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 @@ (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 @@ (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 @@ (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 @@ (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))) diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/progmodes/compile.el --- a/lisp/progmodes/compile.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/progmodes/compile.el Tue Jul 27 04:10:05 2010 +0200 @@ -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 diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/time.el --- a/lisp/time.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/time.el Tue Jul 27 04:10:05 2010 +0200 @@ -87,7 +87,7 @@ ;;;###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 @@ :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 @@ (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 () diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/url/ChangeLog --- a/lisp/url/ChangeLog Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/url/ChangeLog Tue Jul 27 04:10:05 2010 +0200 @@ -1,3 +1,12 @@ +2010-07-27 Michael Albinus + + * url-http (url-http-parse-headers): Disable file name handlers at + all (not only Tramp). (Bug#6717) + +2010-07-27 Michael Albinus + + * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717) + 2010-07-01 Mark A. Hershberger * url-http.el (url-http-create-request): Add a CRLF on the end so diff -r 9eac3b0c2884 -r a4b9fa0b861b lisp/url/url-http.el --- a/lisp/url/url-http.el Mon Jul 26 15:05:47 2010 -0400 +++ b/lisp/url/url-http.el Tue Jul 27 04:10:05 2010 +0200 @@ -486,7 +486,11 @@ (class nil) (success nil) ;; other status symbols: jewelry and luxury cars - (status-symbol (cadr (assq url-http-response-status url-http-codes)))) + (status-symbol (cadr (assq url-http-response-status url-http-codes))) + ;; The filename part of a URL could be in remote file syntax, + ;; 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) diff -r 9eac3b0c2884 -r a4b9fa0b861b src/ChangeLog --- a/src/ChangeLog Mon Jul 26 15:05:47 2010 -0400 +++ b/src/ChangeLog Tue Jul 27 04:10:05 2010 +0200 @@ -1,3 +1,13 @@ +2010-07-27 Christoph Scholtes + + * minibuf.c (Fread_buffer): Doc fix (bug#6528). + + * window.c (Fwindow_height): Doc fix (bug#6518). + +2010-07-27 Juanma Barranquero + + * buffer.c (syms_of_buffer) : Doc fix. + 2010-07-26 Dan Nicolaescu * keyboard.c (Ftop_level, Fexit_recursive_edit) diff -r 9eac3b0c2884 -r a4b9fa0b861b src/buffer.c --- a/src/buffer.c Mon Jul 26 15:05:47 2010 -0400 +++ b/src/buffer.c Tue Jul 27 04:10:05 2010 +0200 @@ -5899,14 +5899,14 @@ INDICATOR specifies the logical indicator type which is one of the following symbols: `truncation' , `continuation', `overlay-arrow', -`top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'. - -BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies +`top', `bottom', `top-bottom', `up', `down', empty-line', or `unknown'. + +BITMAPS is a list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies the actual bitmap shown in the left or right fringe for the logical indicator. LEFT and RIGHT are the bitmaps shown in the left and/or right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps -are used only for the `bottom' and `one-line' indicators when the last -\(only) line in has no final newline. BITMAPS may also be a single +are used only for the `bottom' and `top-bottom' indicators when the +last (only) line has no final newline. BITMAPS may also be a single symbol which is used in both left and right fringes. */); DEFVAR_PER_BUFFER ("fringe-cursor-alist", diff -r 9eac3b0c2884 -r a4b9fa0b861b src/minibuf.c --- a/src/minibuf.c Mon Jul 26 15:05:47 2010 -0400 +++ b/src/minibuf.c Tue Jul 27 04:10:05 2010 +0200 @@ -1152,7 +1152,7 @@ If DEF is a list of default values, return its first element. Optional third arg REQUIRE-MATCH determines whether non-existing buffer names are allowed. It has the same meaning as the - REQUIRE-MATCH argument of `confirm-after-completion'. + REQUIRE-MATCH argument of `completing-read'. The argument PROMPT should be a string ending with a colon and a space. If `read-buffer-completion-ignore-case' is non-nil, completion ignores case while reading the buffer name. diff -r 9eac3b0c2884 -r a4b9fa0b861b src/window.c --- a/src/window.c Mon Jul 26 15:05:47 2010 -0400 +++ b/src/window.c Tue Jul 27 04:10:05 2010 +0200 @@ -508,7 +508,10 @@ doc: /* Return the number of lines in WINDOW. WINDOW defaults to the selected window. -The return value includes WINDOW's mode line and header line, if any. */) +The return value includes WINDOW's mode line and header line, if any. + +Note: The function does not take into account the value of `line-spacing' +when calculating the number of lines in WINDOW. */) (Lisp_Object window) { return decode_any_window (window)->total_lines;