Now on revision 105503. ------------------------------------------------------------ revno: 105503 committer: martin rudalics branch nick: trunk timestamp: Sat 2011-08-20 12:10:05 +0200 message: Remove some commented-out obsoletion declarations from window.el. diff: === modified file 'lisp/window.el' --- lisp/window.el 2011-08-20 10:02:04 +0000 +++ lisp/window.el 2011-08-20 10:10:05 +0000 @@ -6121,8 +6121,6 @@ (and (consp regexp) (stringp (car regexp)) (string-match-p (car regexp) buffer-name))) (throw 'found t)))))))) -;; (make-obsolete - ;; 'same-window-p "pass argument to buffer display function instead." "24.1") (defcustom special-display-frame-alist '((height . 14) (width . 80) (unsplittable . t)) @@ -6185,9 +6183,6 @@ (set-window-buffer (frame-selected-window frame) buffer) (set-window-dedicated-p (frame-selected-window frame) t) (frame-selected-window frame)))))) -;; (make-obsolete - ;; 'special-display-popup-frame - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom special-display-function 'special-display-popup-frame "Function to call for displaying special buffers. @@ -6363,9 +6358,6 @@ ((and (consp regexp) (stringp (car regexp)) (string-match-p (car regexp) buffer-name)) (throw 'found (cdr regexp)))))))))) -;; (make-obsolete - ;; 'special-display-p - ;; "pass argument to buffer display function instead." "24.1") (defcustom pop-up-frame-alist nil "Alist of parameters for automatically generated new frames. @@ -6530,8 +6522,6 @@ (max split-height-threshold (* 2 (max window-min-height (if mode-line-format 2 1)))))))))) -;; (make-obsolete - ;; 'window-splittable-p "use 2nd arg of `display-buffer' instead." "24.1") (defun split-window-sensibly (window) "Split WINDOW in a way suitable for `display-buffer'. @@ -6581,8 +6571,6 @@ (when (with-no-warnings (window-splittable-p window)) (with-selected-window window (split-window-vertically))))))) -;; (make-obsolete - ;; 'split-window-sensibly "use 2nd arg of `display-buffer' instead." "24.1") ;; Functions for converting Emacs 23 buffer display options to buffer ;; display specifiers. ------------------------------------------------------------ revno: 105502 committer: martin rudalics branch nick: trunk timestamp: Sat 2011-08-20 12:02:04 +0200 message: When displaying a buffer don't use or split a side window unless explicitly requested. * window.el (display-buffer-reuse-window) (display-buffer-pop-up-window): Don't reuse or split a side window. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-19 18:23:09 +0000 +++ lisp/ChangeLog 2011-08-20 10:02:04 +0000 @@ -1,3 +1,9 @@ +2011-08-20 Martin Rudalics + + * window.el (display-buffer-reuse-window) + (display-buffer-pop-up-window): Don't reuse or split a side + window. + 2011-08-19 Glenn Morris * files.el (hack-local-variables-prop-line, hack-local-variables): === modified file 'lisp/window.el' --- lisp/window.el 2011-08-17 06:50:31 +0000 +++ lisp/window.el 2011-08-20 10:02:04 +0000 @@ -4763,8 +4763,10 @@ (dolist (window (window-list-1 nil 'nomini method-frame)) (let ((window-buffer (window-buffer window))) (when (and (not (window-minibuffer-p window)) - ;; Don't reuse a side window. - (or (not (eq (window-parameter window 'window-side) 'side)) + ;; Don't reuse a side window unless it shows the + ;; buffer already. + (or (memq (window-parameter window 'window-side) + '(nil none)) (eq window-buffer buffer)) (or (not method-window) (and (eq method-window 'same) @@ -5033,7 +5035,8 @@ ;; and must be neither a minibuffer window (not (window-minibuffer-p window)) ;; nor a side window. - (not (eq (window-parameter window 'window-side) 'side))) + (memq (window-parameter window 'window-side) + '(nil none))) (setq window (cond ((memq side display-buffer-side-specifiers) @@ -6079,9 +6082,6 @@ See also `same-window-regexps'." :type '(repeat (string :format "%v")) :group 'windows) -;; (make-obsolete-variable - ;; 'same-window-buffer-names - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom same-window-regexps nil "List of regexps saying which buffers should appear in the \"same\" window. @@ -6097,9 +6097,6 @@ See also `same-window-buffer-names'." :type '(repeat (regexp :format "%v")) :group 'windows) -;; (make-obsolete-variable - ;; 'same-window-regexps - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defun same-window-p (buffer-name) "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window. @@ -6143,9 +6140,6 @@ (symbol :tag "Parameter") (sexp :tag "Value"))) :group 'frames) -;; (make-obsolete-variable - ;; 'special-display-frame-alist - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defun special-display-popup-frame (buffer &optional args) "Display BUFFER in a special frame and return the window chosen. @@ -6210,9 +6204,6 @@ :type 'function :group 'windows :group 'frames) -;; (make-obsolete-variable - ;; 'special-display-function - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom special-display-buffer-names nil "List of names of buffers that should be displayed specially. @@ -6277,9 +6268,6 @@ (repeat :tag "Arguments" (sexp))))) :group 'windows :group 'frames) -;; (make-obsolete-variable - ;; 'special-display-buffer-names - ;; "use 2nd arg of `display-buffer' instead." "24.1") ;;;###autoload (put 'special-display-buffer-names 'risky-local-variable t) @@ -6348,9 +6336,6 @@ (repeat :tag "Arguments" (sexp))))) :group 'windows :group 'frames) -;; (make-obsolete-variable - ;; 'special-display-regexps - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defun special-display-p (buffer-name) "Return non-nil if a buffer named BUFFER-NAME gets a special frame. @@ -6400,9 +6385,6 @@ (symbol :tag "Parameter") (sexp :tag "Value"))) :group 'frames) -;; (make-obsolete-variable - ;; 'pop-up-frame-alist - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom pop-up-frame-function (lambda () (make-frame pop-up-frame-alist)) @@ -6412,9 +6394,6 @@ `pop-up-frame-alist'." :type 'function :group 'frames) -;; (make-obsolete-variable - ;; 'pop-up-frame-function - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom pop-up-frames nil "Whether `display-buffer' should make a separate frame. @@ -6428,9 +6407,6 @@ (const :tag "Always" t)) :group 'windows :group 'frames) -;; (make-obsolete-variable - ;; 'pop-up-frames - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom display-buffer-reuse-frames nil "Set and non-nil means `display-buffer' should reuse frames. @@ -6440,17 +6416,11 @@ :version "21.1" :group 'windows :group 'frames) -;; (make-obsolete-variable - ;; 'display-buffer-reuse-frames - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom pop-up-windows t "Non-nil means `display-buffer' should make a new window." :type 'boolean :group 'windows) -;; (make-obsolete-variable - ;; 'pop-up-windows - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom split-window-preferred-function 'split-window-sensibly "Function called by `display-buffer' to split a window. @@ -6477,9 +6447,6 @@ :type 'function :version "23.1" :group 'windows) -;; (make-obsolete-variable - ;; 'split-window-preferred-function - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom split-height-threshold 80 "Minimum height for splitting a window to display a buffer. @@ -6491,9 +6458,6 @@ :type '(choice (const nil) (integer :tag "lines")) :version "23.1" :group 'windows) -;; (make-obsolete-variable - ;; 'split-height-threshold - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom split-width-threshold 160 "Minimum width for splitting a window to display a buffer. @@ -6503,9 +6467,6 @@ :type '(choice (const nil) (integer :tag "columns")) :version "23.1" :group 'windows) -;; (make-obsolete-variable - ;; 'split-width-threshold - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defcustom even-window-heights t "If non-nil `display-buffer' will try to even window heights. @@ -6514,17 +6475,11 @@ window that appears above or below the selected window." :type 'boolean :group 'windows) -;; (make-obsolete-variable - ;; 'even-window-heights - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defvar display-buffer-mark-dedicated nil "Non-nil means `display-buffer' marks the windows it creates as dedicated. The actual non-nil value of this variable will be copied to the `window-dedicated-p' flag.") -;; (make-obsolete-variable - ;; 'display-buffer-mark-dedicated - ;; "use 2nd arg of `display-buffer' instead." "24.1") (defun window-splittable-p (window &optional horizontal) "Return non-nil if `split-window-sensibly' may split WINDOW. ------------------------------------------------------------ revno: 105501 committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2011-08-20 00:27:04 +0000 message: lisp/gnus/ChangeLog: Fix last change. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-08-20 00:20:39 +0000 +++ lisp/gnus/ChangeLog 2011-08-20 00:27:04 +0000 @@ -34,7 +34,7 @@ 2011-08-17 Lars Magne Ingebrigtsen -p * message.el (message-fix-before-sending): Make a different warning + * message.el (message-fix-before-sending): Make a different warning about NUL characters (bug#9270). * gnus-sum.el (gnus-auto-select-subject): Allow specifying a function ------------------------------------------------------------ revno: 105500 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2011-08-20 00:20:39 +0000 message: Merge changes made in Gnus trunk. nnimap.el (nnimap-transform-headers): Protect against (NIL ...) bodystructures (bug#9314). starttls.el (starttls-any-program-available): Define as obsolete function. gnus-util.el (gnus-y-or-n-p): Reinstate the message-clearing y-or-n-p versions which Gnus use when appropriate. gnus-group.el (gnus-group-clear-data): Add a y-or-n query, since it's a pretty destructive command. nnmail.el (nnmail-extra-headers): Clarify slightly (bug#9302). message.el (message-fix-before-sending): Make a different warning about NUL characters (bug#9270). gnus-sum.el (gnus-auto-select-subject): Allow specifying a function from custom (bug#9260). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-08-19 08:52:18 +0000 +++ lisp/gnus/ChangeLog 2011-08-20 00:20:39 +0000 @@ -1,3 +1,8 @@ +2011-08-19 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-transform-headers): Protect against (NIL ...) + bodystructures (bug#9314). + 2011-08-19 Katsumi Yamaoka * gnus-art.el (gnus-insert-mime-button, gnus-mime-display-alternative): @@ -12,8 +17,29 @@ `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't available anymore. +2011-08-12 Simon Josefsson + + * starttls.el (starttls-any-program-available): Define as obsolete + function. + +2011-08-18 Lars Magne Ingebrigtsen + + * gnus-util.el (gnus-y-or-n-p): Reinstate the message-clearing y-or-n-p + versions which Gnus use when appropriate. + + * gnus-group.el (gnus-group-clear-data): Add a y-or-n query, since it's + a pretty destructive command. + + * nnmail.el (nnmail-extra-headers): Clarify slightly (bug#9302). + 2011-08-17 Lars Magne Ingebrigtsen +p * message.el (message-fix-before-sending): Make a different warning + about NUL characters (bug#9270). + + * gnus-sum.el (gnus-auto-select-subject): Allow specifying a function + from custom (bug#9260). + * gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make things work in Emacs 22 and XEmacs, too. === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-07-19 22:19:06 +0000 +++ lisp/gnus/gnus-group.el 2011-08-20 00:20:39 +0000 @@ -3471,13 +3471,14 @@ "Clear all marks and read ranges from the current group. Obeys the process/prefix convention." (interactive "P") - (gnus-group-iterate arg - (lambda (group) - (let (info) - (gnus-info-clear-data (setq info (gnus-get-info group))) - (gnus-get-unread-articles-in-group info (gnus-active group) t) - (when (gnus-group-goto-group group) - (gnus-group-update-group-line)))))) + (when (gnus-y-or-n-p "Really clear data? ") + (gnus-group-iterate arg + (lambda (group) + (let (info) + (gnus-info-clear-data (setq info (gnus-get-info group))) + (gnus-get-unread-articles-in-group info (gnus-active group) t) + (when (gnus-group-goto-group group) + (gnus-group-update-group-line))))))) (defun gnus-group-clear-data-on-native-groups () "Clear all marks and read ranges from all native groups." === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-08-18 22:12:47 +0000 +++ lisp/gnus/gnus-sum.el 2011-08-20 00:20:39 +0000 @@ -375,7 +375,8 @@ (const unread) (const first) (const unseen) - (const unseen-or-unread))) + (const unseen-or-unread) + (function :tag "Function to call"))) (defcustom gnus-auto-select-next t "*If non-nil, offer to go to the next group from the end of the previous. === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-07-01 01:46:17 +0000 +++ lisp/gnus/gnus-util.el 2011-08-20 00:20:39 +0000 @@ -388,57 +388,14 @@ (define-key keymap key (pop plist)) (pop plist))))) -;; Two silly functions to ensure that all `y-or-n-p' questions clear -;; the echo area. -;; -;; Do we really need these functions? Workarounds for bugs in the corresponding -;; Emacs functions? Maybe these bugs are no longer present in any supported -;; (X)Emacs version? Alias them to the original functions and see if anyone -;; reports a problem. If not, replace with original functions. --rsteib, -;; 2007-12-14 -;; -;; All supported Emacsen clear the echo area after `yes-or-no-p', so we can -;; remove `yes-or-no-p'. RMS says that not clearing after `y-or-n-p' is -;; intentional (see below), so we could remove `gnus-y-or-n-p' too. -;; Objections? --rsteib, 2008-02-16 -;; -;; ,----[ http://thread.gmane.org/gmane.emacs.gnus.general/65099/focus=66070 ] -;; | From: Richard Stallman -;; | Subject: Re: Do we need gnus-yes-or-no-p and gnus-y-or-n-p? -;; | To: Katsumi Yamaoka [...] -;; | Cc: emacs-devel@[...], xemacs-beta@[...], ding@[...] -;; | Date: Mon, 07 Jan 2008 12:16:05 -0500 -;; | Message-ID: -;; | -;; | The behavior of `y-or-n-p' that it doesn't clear the question -;; | and the answer is not serious of course, but I feel it is not -;; | cool. -;; | -;; | It is intentional. -;; | -;; | Currently, it is commented out in the trunk by Reiner Steib. He -;; | also wrote the benefit of leaving the question and the answer in -;; | the echo area as follows: -;; | -;; | (http://article.gmane.org/gmane.emacs.gnus.general/66061) -;; | > In contrast to yes-or-no-p it is much easier to type y, n, -;; | > SPC, DEL, etc accidentally, so it might be useful for the user -;; | > to see what he has typed. -;; | -;; | Yes, that is the reason. -;; `---- - -;; (defun gnus-y-or-n-p (prompt) -;; (prog1 -;; (y-or-n-p prompt) -;; (message ""))) -;; (defun gnus-yes-or-no-p (prompt) -;; (prog1 -;; (yes-or-no-p prompt) -;; (message ""))) - -(defalias 'gnus-y-or-n-p 'y-or-n-p) -(defalias 'gnus-yes-or-no-p 'yes-or-no-p) +(defun gnus-y-or-n-p (prompt) + (prog1 + (y-or-n-p prompt) + (message ""))) +(defun gnus-yes-or-no-p (prompt) + (prog1 + (yes-or-no-p prompt) + (message ""))) ;; By Frank Schmitt . Allows to have ;; age-depending date representations. (e.g. just the time if it's === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-08-17 22:09:19 +0000 +++ lisp/gnus/message.el 2011-08-20 00:20:39 +0000 @@ -4254,8 +4254,10 @@ "Invisible text found and made visible; continue sending? ") (error "Invisible text found and made visible"))))) (message-check 'illegible-text - (let (char found choice) + (let (char found choice nul-chars) (message-goto-body) + (setq nul-chars (save-excursion + (search-forward "\000" nil t))) (while (progn (skip-chars-forward mm-7bit-chars) (when (get-text-property (point) 'no-illegible-text) @@ -4281,7 +4283,9 @@ (when found (setq choice (gnus-multiple-choice - "Non-printable characters found. Continue sending?" + (if nul-chars + "NUL characters found, which may cause problems. Continue sending?" + "Non-printable characters found. Continue sending?") `((?d "Remove non-printable characters and send") (?r ,(format "Replace non-printable characters with \"%s\" and send" === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-08-14 05:11:36 +0000 +++ lisp/gnus/nnimap.el 2011-08-20 00:20:39 +0000 @@ -216,9 +216,10 @@ (let ((structure (ignore-errors (read (current-buffer))))) (while (and (consp structure) - (not (stringp (car structure)))) + (not (atom (car structure)))) (setq structure (car structure))) (setq lines (if (and + (stringp (car structure)) (equal (upcase (nth 0 structure)) "MESSAGE") (equal (upcase (nth 1 structure)) "RFC822")) (nth 9 structure) === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2011-02-23 13:35:35 +0000 +++ lisp/gnus/nnmail.el 2011-08-20 00:20:39 +0000 @@ -554,7 +554,9 @@ (const delete))) (defcustom nnmail-extra-headers '(To Newsgroups) - "*Extra headers to parse." + "Extra headers to parse. +In addition to the standard headers, these extra headers will be +included in NOV headers (and the like) when backends parse headers." :version "21.1" :group 'nnmail :type '(repeat symbol)) === modified file 'lisp/gnus/starttls.el' --- lisp/gnus/starttls.el 2011-08-04 00:58:07 +0000 +++ lisp/gnus/starttls.el 2011-08-20 00:20:39 +0000 @@ -301,6 +301,10 @@ starttls-gnutls-program starttls-program))) +(defalias 'starttls-any-program-available 'starttls-available-p) +(make-obsolete 'starttls-any-program-available 'starttls-available-p + "2011-08-02") + (provide 'starttls) ;;; starttls.el ends here ------------------------------------------------------------ revno: 105499 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-08-19 14:23:09 -0400 message: files.el fix for bug#9331 * lisp/files.el (hack-local-variables-prop-line, hack-local-variables): Downcase "Mode:". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-18 15:53:29 +0000 +++ lisp/ChangeLog 2011-08-19 18:23:09 +0000 @@ -1,3 +1,8 @@ +2011-08-19 Glenn Morris + + * files.el (hack-local-variables-prop-line, hack-local-variables): + Downcase "Mode:". (Bug#9331) + 2011-08-18 Chong Yidong * international/characters.el: Add L and R categories. === modified file 'lisp/files.el' --- lisp/files.el 2011-07-16 20:01:37 +0000 +++ lisp/files.el 2011-08-19 18:23:09 +0000 @@ -3003,9 +3003,10 @@ "-mode")))) (or (equal keyname "coding") (condition-case nil - (push (cons (if (eq key 'eval) - 'eval - (indirect-variable key)) + (push (cons (cond ((eq key 'eval) 'eval) + ;; Downcase "Mode:". + ((equal keyname "mode") 'mode) + (t (indirect-variable key))) val) result) (error nil)))) (skip-chars-forward " \t;"))) @@ -3153,6 +3154,7 @@ (var (let ((read-circle nil)) (read str))) val val2) + (and (eq var 'Mode) (setq var 'mode)) ;; Read the variable value. (skip-chars-forward "^:") (forward-char 1) ------------------------------------------------------------ revno: 105498 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-08-19 14:30:29 +0300 message: Avoid a crash in mouse-highlight of Speedbar frames. src/xfaces.c (face_at_buffer_position): Avoid repeated evaluation of face ID by FACE_FROM_ID, and avoid a crash when mouse is moved from an Org mode buffer to a Speedbar frame. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-19 10:18:40 +0000 +++ src/ChangeLog 2011-08-19 11:30:29 +0000 @@ -1,5 +1,9 @@ 2011-08-19 Eli Zaretskii + * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of + face ID by FACE_FROM_ID, and avoid a crash when mouse is moved + from an Org mode buffer to a Speedbar frame. + * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from a composition, take its buffer position from IT->cmp_it.charpos. Fixes cursor positioning at the beginning of a line that begins === modified file 'src/xfaces.c' --- src/xfaces.c 2011-08-14 09:08:02 +0000 +++ src/xfaces.c 2011-08-19 11:30:29 +0000 @@ -6008,9 +6008,18 @@ *endptr = endpos; - default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id - : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID - : lookup_basic_face (f, DEFAULT_FACE_ID)); + { + int face_id; + + if (base_face_id >= 0) + face_id = base_face_id; + else if (NILP (Vface_remapping_alist)) + face_id = DEFAULT_FACE_ID; + else + face_id = lookup_basic_face (f, DEFAULT_FACE_ID); + + default_face = FACE_FROM_ID (f, face_id); + } /* Optimize common cases where we can use the default face. */ if (noverlays == 0