Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101723. ------------------------------------------------------------ revno: 101723 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-10-01 19:46:13 -0700 message: Remove some functions, variables and aliases obsolete since at least 21.1. * doc/misc/misc.texi (Shell Mode): Remove reference to old function name. * src/character.c (Fchar_bytes): Remove obsolete function. (syms_of_character): Remove Schar_bytes. * lisp/subr.el (char-bytes): Remove obsolete function. * lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias. * lisp/isearch.el (isearch-return-char): Remove obsolete function. * lisp/mouse.el: No longer provide mldrag. (mldrag-drag-mode-line, mldrag-drag-vertical-line): Remove obsolete aliases. * lisp/comint.el (comint-kill-output): Remove obsolete alias. * lisp/shell.el: Comment fix. * lisp/composite.el (decompose-composite-char): Remove obsolete function. * lisp/ps-def.el (decompose-composite-char): Remove unused function. * lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function. * lisp/outline.el (outline-visible): Remove obsolete function. * lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight): * lisp/faces.el (internal-find-face, internal-get-face) (frame-update-faces, frame-update-face-colors) (x-frob-font-weight, x-frob-font-slant) (internal-frob-font-weight, internal-frob-font-slant) (x-make-font-bold, x-make-font-demibold, x-make-font-unbold) (x-make-font-italic, x-make-font-oblique, x-make-font-unitalic) (x-make-font-bold-italic): Remove functions and aliases, obsolete since Emacs 21.1. * lisp/emulation/viper-util.el (viper-get-face): * lisp/obsolete/lucid.el (find-face, get-face): Use facep. * lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face): Remove unused functions. * lisp/vc/ediff-util.el (ediff-submit-report): Doc fix. * etc/NEWS: Mention above changes. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-09-30 12:44:25 +0000 +++ doc/emacs/ChangeLog 2010-10-02 02:46:13 +0000 @@ -1,3 +1,7 @@ +2010-10-02 Glenn Morris + + * misc.texi (Shell Mode): Remove reference to old function name. + 2010-09-30 Eli Zaretskii * maintaining.texi (VC Mode Line): Mention all the possible VC status === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2010-09-02 05:41:23 +0000 +++ doc/emacs/misc.texi 2010-10-02 02:46:13 +0000 @@ -786,8 +786,7 @@ @findex comint-delete-output Delete the last batch of output from a shell command (@code{comint-delete-output}). This is useful if a shell command spews -out lots of output that just gets in the way. This command used to be -called @code{comint-kill-output}. +out lots of output that just gets in the way. @item C-c C-s @kindex C-c C-s @r{(Shell mode)} === modified file 'etc/NEWS' --- etc/NEWS 2010-10-02 02:30:11 +0000 +++ etc/NEWS 2010-10-02 02:46:13 +0000 @@ -538,6 +538,20 @@ versions, these regions were delineated by `mouse-drag-overlay', which has now been removed. +** The following functions and aliases, obsolete since at least Emacs 21.1, +have been removed: +comint-kill-output, decompose-composite-char, outline-visible, +internal-find-face, internal-get-face, frame-update-faces, +frame-update-face-colors, x-frob-font-weight, x-frob-font-slant, +x-make-font-bold, x-make-font-demibold, x-make-font-unbold +x-make-font-italic, x-make-font-oblique, x-make-font-unitalic +x-make-font-bold-italic, mldrag-drag-mode-line, mldrag-drag-vertical-line, +iswitchb-default-keybindings, char-bytes, isearch-return-char + +** The following variables and aliases, obsolete since at least Emacs 21.1, +have been removed: +checkdoc-minor-keymap + * Lisp changes in Emacs 24.1 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-02 02:30:11 +0000 +++ lisp/ChangeLog 2010-10-02 02:46:13 +0000 @@ -1,5 +1,39 @@ 2010-10-02 Glenn Morris + * emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias. + + * subr.el (char-bytes): Remove obsolete function. + + * isearch.el (isearch-return-char): Remove obsolete function. + + * mouse.el: No longer provide mldrag. + (mldrag-drag-mode-line, mldrag-drag-vertical-line): + Remove obsolete aliases. + + * comint.el (comint-kill-output): Remove obsolete alias. + + * composite.el (decompose-composite-char): Remove obsolete function. + * ps-def.el (decompose-composite-char): Remove unused function. + + * iswitchb.el (iswitchb-default-keybindings): Remove obsolete function. + + * outline.el (outline-visible): Remove obsolete function. + + * term/pc-win.el (x-frob-font-slant, x-frob-font-weight): + * faces.el (internal-find-face, internal-get-face) + (frame-update-faces, frame-update-face-colors) + (x-frob-font-weight, x-frob-font-slant) + (internal-frob-font-weight, internal-frob-font-slant) + (x-make-font-bold, x-make-font-demibold, x-make-font-unbold) + (x-make-font-italic, x-make-font-oblique, x-make-font-unitalic) + (x-make-font-bold-italic): Remove functions and aliases, obsolete + since Emacs 21.1. + * emulation/viper-util.el (viper-get-face): + * obsolete/lucid.el (find-face, get-face): Use facep. + * vc/ediff-init.el (ediff-valid-color-p, ediff-get-face): + Remove unused functions. + * vc/ediff-util.el (ediff-submit-report): Doc fix. + * emacs-lisp/bytecomp.el (byte-compile-file): Use kill-emacs-hook to delete tempfile if interrupted during compilation. === modified file 'lisp/comint.el' --- lisp/comint.el 2010-09-23 07:09:24 +0000 +++ lisp/comint.el 2010-10-02 02:46:13 +0000 @@ -2296,8 +2296,6 @@ (delete-region pmark (point)))) ;; Output message and put back prompt (comint-output-filter proc replacement))) -(define-obsolete-function-alias 'comint-kill-output - 'comint-delete-output "21.1") (defun comint-write-output (filename &optional append mustbenew) "Write output from interpreter since last input to FILENAME. === modified file 'lisp/composite.el' --- lisp/composite.el 2010-08-30 13:57:42 +0000 +++ lisp/composite.el 2010-10-02 02:46:13 +0000 @@ -756,23 +756,6 @@ (defalias 'toggle-auto-composition 'auto-composition-mode) -;; The following codes are only for backward compatibility with Emacs -;; 20.4 and earlier. - -(defun decompose-composite-char (char &optional type with-composition-rule) - "Convert CHAR to string. - -If optional 2nd arg TYPE is non-nil, it is `string', `list', or -`vector'. In this case, CHAR is converted to string, list of CHAR, or -vector of CHAR respectively. -Optional 3rd arg WITH-COMPOSITION-RULE is ignored." - (cond ((or (null type) (eq type 'string)) (char-to-string char)) - ((eq type 'list) (list char)) - (t (vector char)))) - -(make-obsolete 'decompose-composite-char 'char-to-string "21.1") - - ;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33 ;;; composite.el ends here === modified file 'lisp/emacs-lisp/checkdoc.el' --- lisp/emacs-lisp/checkdoc.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/checkdoc.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,7 @@ ;;; checkdoc.el --- check documentation strings for style requirements -;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam ;; Version: 0.6.2 @@ -1207,9 +1207,6 @@ map) "Keymap used to override evaluation key-bindings for documentation checking.") -(define-obsolete-variable-alias 'checkdoc-minor-keymap - 'checkdoc-minor-mode-map "21.1") - ;; Add in a menubar with easy-menu (easy-menu-define === modified file 'lisp/emulation/viper-util.el' --- lisp/emulation/viper-util.el 2010-08-29 16:17:13 +0000 +++ lisp/emulation/viper-util.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,8 @@ ;;; viper-util.el --- Utilities used by viper.el ;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Package: viper @@ -77,7 +78,7 @@ (defalias 'viper-int-to-char (if (featurep 'xemacs) 'int-to-char 'identity)) (defalias 'viper-get-face - (if (featurep 'xemacs) 'get-face 'internal-get-face)) + (if (featurep 'xemacs) 'get-face 'facep)) (defalias 'viper-color-defined-p (if (featurep 'xemacs) 'valid-color-name-p 'x-color-defined-p)) (defalias 'viper-iconify === modified file 'lisp/faces.el' --- lisp/faces.el 2010-08-29 16:17:13 +0000 +++ lisp/faces.el 2010-10-02 02:46:13 +0000 @@ -186,33 +186,6 @@ (internal-copy-lisp-face old-face new-face frame new-frame)) new-face)) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Obsolete functions -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; The functions in this section are defined because Lisp packages use -;; them, despite the prefix `internal-' suggesting that they are -;; private to the face implementation. - -(defun internal-find-face (name &optional frame) - "Retrieve the face named NAME. -Return nil if there is no such face. -If NAME is already a face, it is simply returned. -The optional argument FRAME is ignored." - (facep name)) -(make-obsolete 'internal-find-face 'facep "21.1") - - -(defun internal-get-face (name &optional frame) - "Retrieve the face named NAME; error if there is none. -If NAME is already a face, it is simply returned. -The optional argument FRAME is ignored." - (or (facep name) - (check-face name))) -(make-obsolete 'internal-get-face "see `facep' and `check-face'." "21.1") - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Predicates, type checks. @@ -2153,23 +2126,6 @@ (face-set-after-frame-default frame))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Compatibility with 20.2 -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Update a frame's faces when we change its default font. - -(defalias 'frame-update-faces 'ignore "") -(make-obsolete 'frame-update-faces "no longer necessary." "21.1") - -;; Update the colors of FACE, after FRAME's own colors have been -;; changed. - -(define-obsolete-function-alias 'frame-update-face-colors - 'frame-set-background-mode "21.1") - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Standard faces. @@ -2620,97 +2576,6 @@ (car fonts)) (cdr (assq 'font (frame-parameters (selected-frame)))))) - -(defun x-frob-font-weight (font which) - (let ((case-fold-search t)) - (cond ((string-match x-font-regexp font) - (concat (substring font 0 - (match-beginning x-font-regexp-weight-subnum)) - which - (substring font (match-end x-font-regexp-weight-subnum) - (match-beginning x-font-regexp-adstyle-subnum)) - ;; Replace the ADD_STYLE_NAME field with * - ;; because the info in it may not be the same - ;; for related fonts. - "*" - (substring font (match-end x-font-regexp-adstyle-subnum)))) - ((string-match x-font-regexp-head font) - (concat (substring font 0 (match-beginning 1)) which - (substring font (match-end 1)))) - ((string-match x-font-regexp-weight font) - (concat (substring font 0 (match-beginning 1)) which - (substring font (match-end 1))))))) -(make-obsolete 'x-frob-font-weight 'make-face-... "21.1") - -(defun x-frob-font-slant (font which) - (let ((case-fold-search t)) - (cond ((string-match x-font-regexp font) - (concat (substring font 0 - (match-beginning x-font-regexp-slant-subnum)) - which - (substring font (match-end x-font-regexp-slant-subnum) - (match-beginning x-font-regexp-adstyle-subnum)) - ;; Replace the ADD_STYLE_NAME field with * - ;; because the info in it may not be the same - ;; for related fonts. - "*" - (substring font (match-end x-font-regexp-adstyle-subnum)))) - ((string-match x-font-regexp-head font) - (concat (substring font 0 (match-beginning 2)) which - (substring font (match-end 2)))) - ((string-match x-font-regexp-slant font) - (concat (substring font 0 (match-beginning 1)) which - (substring font (match-end 1))))))) -(make-obsolete 'x-frob-font-slant 'make-face-... "21.1") - -;; These aliases are here so that we don't get warnings about obsolete -;; functions from the byte compiler. -(defalias 'internal-frob-font-weight 'x-frob-font-weight) -(defalias 'internal-frob-font-slant 'x-frob-font-slant) - -(defun x-make-font-bold (font) - "Given an X font specification, make a bold version of it. -If that can't be done, return nil." - (internal-frob-font-weight font "bold")) -(make-obsolete 'x-make-font-bold 'make-face-bold "21.1") - -(defun x-make-font-demibold (font) - "Given an X font specification, make a demibold version of it. -If that can't be done, return nil." - (internal-frob-font-weight font "demibold")) -(make-obsolete 'x-make-font-demibold 'make-face-bold "21.1") - -(defun x-make-font-unbold (font) - "Given an X font specification, make a non-bold version of it. -If that can't be done, return nil." - (internal-frob-font-weight font "medium")) -(make-obsolete 'x-make-font-unbold 'make-face-unbold "21.1") - -(defun x-make-font-italic (font) - "Given an X font specification, make an italic version of it. -If that can't be done, return nil." - (internal-frob-font-slant font "i")) -(make-obsolete 'x-make-font-italic 'make-face-italic "21.1") - -(defun x-make-font-oblique (font) ; you say tomayto... - "Given an X font specification, make an oblique version of it. -If that can't be done, return nil." - (internal-frob-font-slant font "o")) -(make-obsolete 'x-make-font-oblique 'make-face-italic "21.1") - -(defun x-make-font-unitalic (font) - "Given an X font specification, make a non-italic version of it. -If that can't be done, return nil." - (internal-frob-font-slant font "r")) -(make-obsolete 'x-make-font-unitalic 'make-face-unitalic "21.1") - -(defun x-make-font-bold-italic (font) - "Given an X font specification, make a bold and italic version of it. -If that can't be done, return nil." - (and (setq font (internal-frob-font-weight font "bold")) - (internal-frob-font-slant font "i"))) -(make-obsolete 'x-make-font-bold-italic 'make-face-bold-italic "21.1") - (provide 'faces) ;; arch-tag: 19a4759f-2963-445f-b004-425b9aadd7d6 === modified file 'lisp/isearch.el' --- lisp/isearch.el 2010-09-23 19:00:31 +0000 +++ lisp/isearch.el 2010-10-02 02:46:13 +0000 @@ -1994,12 +1994,6 @@ (setq char (unibyte-char-to-multibyte char))) (isearch-process-search-char char)))) -(defun isearch-return-char () - "Convert return into newline for incremental search." - (interactive) - (isearch-process-search-char ?\n)) -(make-obsolete 'isearch-return-char 'isearch-printing-char "19.7") - (defun isearch-printing-char () "Add this ordinary printing character to the search string and search." (interactive) === modified file 'lisp/iswitchb.el' --- lisp/iswitchb.el 2010-08-21 13:35:27 +0000 +++ lisp/iswitchb.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,7 @@ ;;; iswitchb.el --- switch between buffers using substrings -;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Stephen Eglen ;; Maintainer: Stephen Eglen @@ -1119,19 +1119,6 @@ (get-buffer-window buffer 0) ; better than 'visible ))) -(defun iswitchb-default-keybindings () - "Set up default keybindings for `iswitchb-buffer'. -Call this function to override the normal bindings. This function also -adds a hook to the minibuffer." - (interactive) - (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup) - (global-set-key "\C-xb" 'iswitchb-buffer) - (global-set-key "\C-x4b" 'iswitchb-buffer-other-window) - (global-set-key "\C-x4\C-o" 'iswitchb-display-buffer) - (global-set-key "\C-x5b" 'iswitchb-buffer-other-frame)) - -(make-obsolete 'iswitchb-default-keybindings 'iswitchb-mode "21.1") - (defun iswitchb-buffer () "Switch to another buffer. === modified file 'lisp/mouse.el' --- lisp/mouse.el 2010-09-05 22:40:57 +0000 +++ lisp/mouse.el 2010-10-02 02:46:13 +0000 @@ -2130,12 +2130,5 @@ (provide 'mouse) -;; This file contains the functionality of the old mldrag.el. -(defalias 'mldrag-drag-mode-line 'mouse-drag-mode-line) -(defalias 'mldrag-drag-vertical-line 'mouse-drag-vertical-line) -(make-obsolete 'mldrag-drag-mode-line 'mouse-drag-mode-line "21.1") -(make-obsolete 'mldrag-drag-vertical-line 'mouse-drag-vertical-line "21.1") -(provide 'mldrag) - ;; arch-tag: 9a710ce1-914a-4923-9b81-697f7bf82ab3 ;;; mouse.el ends here === modified file 'lisp/obsolete/lucid.el' --- lisp/obsolete/lucid.el 2010-01-13 08:35:10 +0000 +++ lisp/obsolete/lucid.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,7 @@ ;;; lucid.el --- emulate some Lucid Emacs functions -;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations @@ -89,8 +89,8 @@ ((display-grayscale-p device) 'grayscale) (t 'mono))) -(defalias 'find-face 'internal-find-face) -(defalias 'get-face 'internal-get-face) +(defalias 'find-face 'facep) +(defalias 'get-face 'facep) ;; internal-try-face-font was removed from faces.el in rev 1.139, 1999/07/21. ;;;(defalias 'try-face-font 'internal-try-face-font) === modified file 'lisp/outline.el' --- lisp/outline.el 2010-03-20 19:04:44 +0000 +++ lisp/outline.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,8 @@ ;;; outline.el --- outline mode commands for Emacs ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: outlines @@ -445,10 +446,6 @@ "Non-nil if the character after point is invisible." (get-char-property (or pos (point)) 'invisible)) -(defun outline-visible () - (not (outline-invisible-p))) -(make-obsolete 'outline-visible 'outline-invisible-p "21.1") - (defun outline-back-to-heading (&optional invisible-ok) "Move to previous heading line, or beg of this line if it's a heading. Only visible heading lines are considered, unless INVISIBLE-OK is non-nil." === modified file 'lisp/ps-def.el' --- lisp/ps-def.el 2010-08-29 16:17:13 +0000 +++ lisp/ps-def.el 2010-10-02 02:46:13 +0000 @@ -99,11 +99,6 @@ (setq count (1- count))) (+ (point) (* count step)))))) - (or (fboundp 'decompose-composite-char) - (defun decompose-composite-char (char &optional type - with-composition-rule) - nil)) - (or (fboundp 'encode-coding-string) (defun encode-coding-string (string coding-system &optional nocopy) (if nocopy === modified file 'lisp/shell.el' --- lisp/shell.el 2010-06-11 13:28:41 +0000 +++ lisp/shell.el 2010-10-02 02:46:13 +0000 @@ -70,7 +70,7 @@ ;; c-c c-c comint-interrupt-subjob ^c ;; c-c c-z comint-stop-subjob ^z ;; c-c c-\ comint-quit-subjob ^\ -;; c-c c-o comint-kill-output Delete last batch of process output +;; c-c c-o comint-delete-output Delete last batch of process output ;; c-c c-r comint-show-output Show last batch of process output ;; c-c c-l comint-dynamic-list-input-ring List input history ;; send-invisible Read line w/o echo & send to proc === modified file 'lisp/subr.el' --- lisp/subr.el 2010-09-20 00:52:17 +0000 +++ lisp/subr.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,8 @@ ;;; subr.el --- basic lisp subroutines for Emacs ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -1017,7 +1018,6 @@ (define-obsolete-function-alias 'eval-current-buffer 'eval-buffer "22.1") (define-obsolete-function-alias 'string-to-int 'string-to-number "22.1") -(make-obsolete 'char-bytes "now always returns 1." "20.4") (make-obsolete 'forward-point "use (+ (point) N) instead." "23.1") (defun insert-string (&rest args) === modified file 'lisp/term/pc-win.el' --- lisp/term/pc-win.el 2010-09-02 10:17:02 +0000 +++ lisp/term/pc-win.el 2010-10-02 02:46:13 +0000 @@ -286,15 +286,6 @@ (if (x-selection-owner-p selection) t)) -;; From lisp/faces.el: we only have one font, so always return -;; it, no matter which variety they've asked for. -(defun x-frob-font-slant (font which) - font) -(make-obsolete 'x-frob-font-slant 'make-face-... "21.1") -(defun x-frob-font-weight (font which) - font) -(make-obsolete 'x-frob-font-weight 'make-face-... "21.1") - ;; From src/fontset.c: (fset 'query-fontset 'ignore) === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2010-08-29 16:17:13 +0000 +++ lisp/vc/ediff-init.el 2010-10-02 02:46:13 +0000 @@ -787,16 +787,6 @@ "") -(if (ediff-has-face-support-p) - (if (featurep 'xemacs) - (progn - (defalias 'ediff-valid-color-p 'valid-color-name-p) - (defalias 'ediff-get-face 'get-face)) - (defalias 'ediff-valid-color-p (if (fboundp 'color-defined-p) - 'color-defined-p - 'x-color-defined-p)) - (defalias 'ediff-get-face 'internal-get-face))) - (if (ediff-window-display-p) (if (featurep 'xemacs) (progn === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2010-08-29 16:17:13 +0000 +++ lisp/vc/ediff-util.el 2010-10-02 02:46:13 +0000 @@ -1,7 +1,8 @@ ;;; ediff-util.el --- the core commands and utilities of ediff ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Michael Kifer ;; Package: ediff @@ -3994,7 +3995,7 @@ ........................ While compiling the end of the data: ** The following functions are not known to be defined: - ediff-valid-color-p, ediff-set-face, + xxx, yyy ........................ These are NOT errors, but inevitable warnings, which ought to be ignored. === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-02 02:30:11 +0000 +++ src/ChangeLog 2010-10-02 02:46:13 +0000 @@ -1,5 +1,8 @@ 2010-10-02 Glenn Morris + * character.c (Fchar_bytes): Remove obsolete function. + (syms_of_character): Remove Schar_bytes. + * emacs.c (fatal_error_signal): Also run Fkill_emacs on SIGINT. (main) [!WINDOWSNT]: Handle SIGINT with fatal_error_signal in batch-mode. === modified file 'src/character.c' --- src/character.c 2010-09-23 14:32:38 +0000 +++ src/character.c 2010-10-02 02:46:13 +0000 @@ -336,16 +336,6 @@ } } -DEFUN ("char-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0, - doc: /* Return 1 regardless of the argument CHAR. -This is now an obsolete function. We keep it just for backward compatibility. -usage: (char-bytes CHAR) */) - (Lisp_Object ch) -{ - CHECK_CHARACTER (ch); - return make_number (1); -} - DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, doc: /* Return width of CHAR when displayed in the current buffer. The width is measured by how many columns it occupies on the screen. @@ -1073,7 +1063,6 @@ defsubr (&Scharacterp); defsubr (&Sunibyte_char_to_multibyte); defsubr (&Smultibyte_char_to_unibyte); - defsubr (&Schar_bytes); defsubr (&Schar_width); defsubr (&Sstring_width); defsubr (&Schar_direction); ------------------------------------------------------------ revno: 101722 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-10-01 19:30:11 -0700 message: Run kill-emacs-hook in batch mode, and on SIGINT in batch mode. See thread http://lists.gnu.org/archive/html/emacs-devel/2010-09/msg00795.html * src/emacs.c (fatal_error_signal): Also run Fkill_emacs on SIGINT. (main) [!WINDOWSNT]: Handle SIGINT with fatal_error_signal in batch-mode. (Fkill_emacs): Doc fix. Also run the hook in batch mode. (kill-emacs-hook): Doc fix. * lisp/emacs-lisp/bytecomp.el (byte-compile-file): Use kill-emacs-hook to delete tempfile if interrupted during compilation. * doc/lispref/os.texi (Killing Emacs): Hook now runs in batch mode. * etc/NEWS: Mention these changes. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-09-18 15:50:06 +0000 +++ doc/lispref/ChangeLog 2010-10-02 02:30:11 +0000 @@ -1,3 +1,7 @@ +2010-10-02 Glenn Morris + + * os.texi (Killing Emacs): Hook now runs in batch mode. + 2010-09-18 Stefan Monnier * text.texi (Special Properties): Clarify when modification-hooks run. === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2010-08-25 20:25:32 +0000 +++ doc/lispref/os.texi 2010-10-02 02:30:11 +0000 @@ -577,7 +577,6 @@ This variable is a normal hook; once @code{save-buffers-kill-emacs} is finished with all file saving and confirmation, it calls @code{kill-emacs} which runs the functions in this hook. -@code{kill-emacs} does not run this hook in batch mode. @code{kill-emacs} may be invoked directly (that is not via @code{save-buffers-kill-emacs}) if the terminal is disconnected, or in === modified file 'etc/NEWS' --- etc/NEWS 2010-09-30 02:23:25 +0000 +++ etc/NEWS 2010-10-02 02:30:11 +0000 @@ -149,6 +149,11 @@ *** Tramp offers handlers for file-selinux-context and set-file-selinux-context for remote machines which support SELinux. +** The function kill-emacs is now run upon receipt of the signals SIGTERM +and SIGHUP, and (except on MS-Windows) SIGINT in batch mode. + +** kill-emacs-hook is now also run in batch mode. + ** New scrolling commands `scroll-up-command' and `scroll-down-command' (bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom of buffer at first key-press (instead moves to top/bottom of buffer) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-01 12:56:44 +0000 +++ lisp/ChangeLog 2010-10-02 02:30:11 +0000 @@ -1,3 +1,8 @@ +2010-10-02 Glenn Morris + + * emacs-lisp/bytecomp.el (byte-compile-file): Use kill-emacs-hook to + delete tempfile if interrupted during compilation. + 2010-10-01 Lars Magne Ingebrigtsen * net/tls.el (tls-starttls-switches): Give up on using starttls with === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-09-23 07:55:01 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-10-02 02:30:11 +0000 @@ -1698,12 +1698,15 @@ (insert "\n") ; aaah, unix. (if (file-writable-p target-file) ;; We must disable any code conversion here. - (let ((coding-system-for-write 'no-conversion) - ;; Write to a tempfile so that if another Emacs - ;; process is trying to load target-file (eg in a - ;; parallel bootstrap), it does not risk getting a - ;; half-finished file. (Bug#4196) - (tempfile (make-temp-name target-file))) + (let* ((coding-system-for-write 'no-conversion) + ;; Write to a tempfile so that if another Emacs + ;; process is trying to load target-file (eg in a + ;; parallel bootstrap), it does not risk getting a + ;; half-finished file. (Bug#4196) + (tempfile (make-temp-name target-file)) + (kill-emacs-hook + (cons (lambda () (ignore-errors (delete-file tempfile))) + kill-emacs-hook))) (if (memq system-type '(ms-dos 'windows-nt)) (setq buffer-file-type t)) (write-region (point-min) (point-max) tempfile nil 1) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-02 00:36:47 +0000 +++ src/ChangeLog 2010-10-02 02:30:11 +0000 @@ -1,3 +1,11 @@ +2010-10-02 Glenn Morris + + * emacs.c (fatal_error_signal): Also run Fkill_emacs on SIGINT. + (main) [!WINDOWSNT]: Handle SIGINT with fatal_error_signal + in batch-mode. + (Fkill_emacs): Doc fix. Also run the hook in batch mode. + (kill-emacs-hook): Doc fix. + 2010-10-02 Lars Magne Ingebrigtsen * xml.c (Flibxml_parse_xml_region, Flibxml_parse_html_region) === modified file 'src/emacs.c' --- src/emacs.c 2010-09-26 06:06:28 +0000 +++ src/emacs.c 2010-10-02 02:30:11 +0000 @@ -378,7 +378,7 @@ { fatal_error_in_progress = 1; - if (sig == SIGTERM || sig == SIGHUP) + if (sig == SIGTERM || sig == SIGHUP || sig == SIGINT) Fkill_emacs (make_number (sig)); shut_down_emacs (sig, 0, Qnil); @@ -1240,6 +1240,14 @@ #ifdef SIGSYS signal (SIGSYS, fatal_error_signal); #endif +#ifndef WINDOWSNT + /* May need special treatment on MS-Windows. See + http://lists.gnu.org/archive/html/emacs-devel/2010-09/msg01062.html + Please update the doc of kill-emacs, kill-emacs-hook, and + NEWS if you change this. + */ + if ( noninteractive ) signal (SIGINT, fatal_error_signal); +#endif signal (SIGTERM, fatal_error_signal); #ifdef SIGXCPU signal (SIGXCPU, fatal_error_signal); @@ -1988,6 +1996,9 @@ If ARG is an integer, return ARG as the exit program code. If ARG is a string, stuff it as keyboard input. +This function is called upon receipt of the signals SIGTERM +or SIGHUP, and (except on MS-Windows) SIGINT in batch mode. + The value of `kill-emacs-hook', if not void, is a list of functions (of no args), all of which are called before Emacs is actually killed. */) @@ -2000,7 +2011,7 @@ if (feof (stdin)) arg = Qt; - if (!NILP (Vrun_hooks) && !noninteractive) + if (!NILP (Vrun_hooks)) call1 (Vrun_hooks, intern ("kill-emacs-hook")); UNGCPRO; @@ -2421,7 +2432,8 @@ expect to be able to interact with the user. To ask for confirmation, see `kill-emacs-query-functions' instead. -The hook is not run in batch mode, i.e., if `noninteractive' is non-nil. */); +Before Emacs 24.1, the hook was not run in batch mode, i.e., if +`noninteractive' was non-nil. */); Vkill_emacs_hook = Qnil; DEFVAR_INT ("emacs-priority", &emacs_priority, ------------------------------------------------------------ revno: 101721 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2010-10-02 04:04:20 +0200 message: Modify url-retrieve and related functions and structures to respect a `silent' flag to signal that the operation should be silent. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-10-01 14:49:14 +0000 +++ lisp/url/ChangeLog 2010-10-02 02:04:20 +0000 @@ -1,3 +1,17 @@ +2010-10-02 Lars Magne Ingebrigtsen + + * url-util.el (url-display-percentage): Don't message when the URL + is silent. + (url-lazy-message): Ditto. + + * url-http.el (url-http-parse-headers): Pass the SILENT parameter + back to the fetching function. + + * url.el (url-retrieve): Add a silent parameter. + (url-retrieve-internal): Ditto. + + * url-parse.el (url): Add a `silent' slot in the URL struct. + 2010-10-01 Lars Magne Ingebrigtsen * url-cookie.el (url-cookie-handle-set-cookie): Use === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2010-10-01 14:05:25 +0000 +++ lisp/url/url-http.el 2010-10-02 02:04:20 +0000 @@ -643,7 +643,8 @@ (set (make-local-variable 'url-redirect-buffer) (url-retrieve-internal redirect-uri url-callback-function - url-callback-arguments)) + url-callback-arguments + (url-silent url-current-object))) (url-mark-buffer-as-dead buffer)) ;; We hit url-max-redirections, so issue an error and ;; stop redirecting. === modified file 'lisp/url/url-parse.el' --- lisp/url/url-parse.el 2010-06-22 16:48:53 +0000 +++ lisp/url/url-parse.el 2010-10-02 02:04:20 +0000 @@ -36,7 +36,7 @@ (&optional type user password host portspec filename target attributes fullness)) (:copier nil)) - type user password host portspec filename target attributes fullness) + type user password host portspec filename target attributes fullness silent) (defsubst url-port (urlobj) (or (url-portspec urlobj) === modified file 'lisp/url/url-util.el' --- lisp/url/url-util.el 2010-09-11 01:58:42 +0000 +++ lisp/url/url-util.el 2010-10-02 02:04:20 +0000 @@ -177,11 +177,17 @@ (defun url-lazy-message (&rest args) "Just like `message', but is a no-op if called more than once a second. Will not do anything if `url-show-status' is nil." - (if (or (null url-show-status) + (if (or (and url-current-object + (url-silent url-current-object)) + (null url-show-status) (active-minibuffer-window) (= url-lazy-message-time (setq url-lazy-message-time (nth 1 (current-time))))) nil + (message "hei: %s" url-current-object) + (with-current-buffer (get-buffer-create "back") + (let ((standard-output (current-buffer))) + (backtrace))) (apply 'message args))) ;;;###autoload @@ -222,7 +228,9 @@ ;;;###autoload (defun url-display-percentage (fmt perc &rest args) - (when url-show-status + (when (and url-show-status + (or (null url-current-object) + (not (url-silent url-current-object)))) (if (null fmt) (if (fboundp 'clear-progress-display) (clear-progress-display)) === modified file 'lisp/url/url.el' --- lisp/url/url.el 2010-03-19 02:55:37 +0000 +++ lisp/url/url.el 2010-10-02 02:04:20 +0000 @@ -121,7 +121,7 @@ variable in the original buffer as a forwarding pointer.") ;;;###autoload -(defun url-retrieve (url callback &optional cbargs) +(defun url-retrieve (url callback &optional cbargs silent) "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished. URL is either a string or a parsed URL. @@ -143,7 +143,9 @@ The variables `url-request-data', `url-request-method' and `url-request-extra-headers' can be dynamically bound around the request; dynamic binding of other variables doesn't necessarily -take effect." +take effect. + +If SILENT, then don't message progress reports and the like." ;;; XXX: There is code in Emacs that does dynamic binding ;;; of the following variables around url-retrieve: ;;; url-standalone-mode, url-gateway-unplugged, w3-honor-stylesheets, @@ -154,12 +156,14 @@ ;;; webmail.el; the latter should be updated. Is ;;; url-cookie-multiple-line needed anymore? The other url-cookie-* ;;; are (for now) only used in synchronous retrievals. - (url-retrieve-internal url callback (cons nil cbargs))) + (url-retrieve-internal url callback (cons nil cbargs) silent)) -(defun url-retrieve-internal (url callback cbargs) +(defun url-retrieve-internal (url callback cbargs &optional silent) "Internal function; external interface is `url-retrieve'. CBARGS is what the callback will actually receive - the first item is -the list of events, as described in the docstring of `url-retrieve'." +the list of events, as described in the docstring of `url-retrieve'. + +If SILENT, don't message progress reports and the like." (url-do-setup) (url-gc-dead-buffers) (if (stringp url) @@ -170,6 +174,7 @@ (error "Must provide a callback function to url-retrieve")) (unless (url-type url) (error "Bad url: %s" (url-recreate-url url))) + (setf (url-silent url) silent) (let ((loader (url-scheme-get-property (url-type url) 'loader)) (url-using-proxy (if (url-host url) (url-find-proxy-for-url url (url-host url)))) @@ -179,7 +184,8 @@ (setq asynch t loader 'url-proxy)) (if asynch - (setq buffer (funcall loader url callback cbargs)) + (let ((url-current-object url)) + (setq buffer (funcall loader url callback cbargs))) (setq buffer (funcall loader url)) (if buffer (with-current-buffer buffer ------------------------------------------------------------ revno: 101720 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2010-10-02 02:39:15 +0200 message: Clean up trailing whitespace. diff: === modified file 'src/xml.c' --- src/xml.c 2010-10-02 00:36:47 +0000 +++ src/xml.c 2010-10-02 00:39:15 +0000 @@ -86,7 +86,7 @@ LIBXML_TEST_VERSION; validate_region (&start, &end); - + istart = XINT (start); iend = XINT (end); @@ -100,7 +100,7 @@ } bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart); - + if (htmlp) doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), bytes, burl, "utf-8", ------------------------------------------------------------ revno: 101719 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2010-10-02 02:36:47 +0200 message: xml.c: Rework the functions to take regions instead of strings, and rename the functions to reflect clearly that they come from the libxml package. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 20:18:24 +0000 +++ src/ChangeLog 2010-10-02 00:36:47 +0000 @@ -1,3 +1,9 @@ +2010-10-02 Lars Magne Ingebrigtsen + + * xml.c (Flibxml_parse_xml_region, Flibxml_parse_html_region) + (parse_region): Reworked to take regions instead of strings, and + renamed to reflect that these are the libxml functions. + 2010-10-01 Eli Zaretskii * term.c (init_tty) [DOS_NT]: Don't call Wcm_clear after setting === modified file 'src/xml.c' --- src/xml.c 2010-09-30 23:26:40 +0000 +++ src/xml.c 2010-10-02 00:36:47 +0000 @@ -74,17 +74,24 @@ } static Lisp_Object -parse_string (Lisp_Object string, Lisp_Object base_url, int htmlp) +parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int htmlp) { xmlDoc *doc; xmlNode *node; Lisp_Object result = Qnil; - int ibeg, iend; const char *burl = ""; + EMACS_INT bytes; + EMACS_INT istart, iend; LIBXML_TEST_VERSION; - CHECK_STRING (string); + validate_region (&start, &end); + + istart = XINT (start); + iend = XINT (end); + + if (istart < GPT && GPT < iend) + move_gap (iend); if (! NILP (base_url)) { @@ -92,13 +99,18 @@ burl = SDATA (base_url); } - doc = htmlp - ? htmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8", - HTML_PARSE_RECOVER|HTML_PARSE_NONET| - HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR) - : xmlReadMemory (SDATA (string), SBYTES (string), burl, "utf-8", - XML_PARSE_NONET|XML_PARSE_NOWARNING| - XML_PARSE_NOERROR); + bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart); + + if (htmlp) + doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), + bytes, burl, "utf-8", + HTML_PARSE_RECOVER|HTML_PARSE_NONET| + HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR); + else + doc = xmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), + bytes, burl, "utf-8", + XML_PARSE_NONET|XML_PARSE_NOWARNING| + XML_PARSE_NOERROR); if (doc != NULL) { @@ -112,24 +124,24 @@ return result; } -DEFUN ("xml-parse-html-string-internal", Fxml_parse_html_string_internal, - Sxml_parse_html_string_internal, - 1, 2, 0, - doc: /* Parse STRING as an HTML document and return the parse tree. +DEFUN ("libxml-parse-html-region", Flibxml_parse_html_region, + Slibxml_parse_html_region, + 2, 3, 0, + doc: /* Parse the region as an HTML document and return the parse tree. If BASE-URL is non-nil, it is used to expand relative URLs. */) - (Lisp_Object string, Lisp_Object base_url) + (Lisp_Object start, Lisp_Object end, Lisp_Object base_url) { - return parse_string (string, base_url, 1); + return parse_region (start, end, base_url, 1); } -DEFUN ("xml-parse-string-internal", Fxml_parse_string_internal, - Sxml_parse_string_internal, - 1, 2, 0, - doc: /* Parse STRING as an XML document and return the parse tree. +DEFUN ("libxml-parse-xml-region", Flibxml_parse_xml_region, + Slibxml_parse_xml_region, + 2, 3, 0, + doc: /* Parse the region as an XML document and return the parse tree. If BASE-URL is non-nil, it is used to expand relative URLs. */) - (Lisp_Object string, Lisp_Object base_url) + (Lisp_Object start, Lisp_Object end, Lisp_Object base_url) { - return parse_string (string, base_url, 0); + return parse_region (start, end, base_url, 0); } @@ -139,8 +151,8 @@ void syms_of_xml (void) { - defsubr (&Sxml_parse_html_string_internal); - defsubr (&Sxml_parse_string_internal); + defsubr (&Slibxml_parse_html_region); + defsubr (&Slibxml_parse_xml_region); } #endif /* HAVE_LIBXML2 */ ------------------------------------------------------------ revno: 101718 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-01 23:14:58 +0000 message: Update ChangeLog. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-01 00:34:42 +0000 +++ doc/misc/ChangeLog 2010-10-01 23:14:58 +0000 @@ -1,3 +1,10 @@ +2010-10-01 Lars Magne Ingebrigtsen + + * gnus.texi (Splitting Mail): Mention the new fancy splitting + function. + (Article Hiding): Add google banner example. Suggested by Benjamin + Xu. + 2010-09-30 Teodor Zlatanov * gnus.texi (Spam Package Configuration Examples, SpamOracle): Remove ------------------------------------------------------------ revno: 101717 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-01 23:08:25 +0000 message: Merge changes made in Gnus trunk. gnus-registry.el: Fix and extend header docs. Move the nnregistry feature check. nnimap.el (nnimap-update-info): Ignore groups that have no UIDNEXT values. nnimap.el: Implement nnimap-request-newgroups. gnus-group.el (gnus-group-completing-read): Return the symbol name, not the value from the collection. nnimap.el: Don't error out on empty non-UIDNEXT groups. nnmail.el (nnmail-article-group): Allow using the fancy split method directly. gnus.el (gnus-continuum-version): Make inactive, since it doesn't really message anything to the user. gnus-msg.el (gnus-summary-resend-message): When resending, don't externalize attachments. gnus.el (gnus-large-newsgroup): Mention gnus-large-ephemeral-newsgroup. gnus-sum.el (gnus-summary-scroll-up): Add more documentation. message.el (message-shorten-references): Comment on the number "21". mm-encode.el (mm-content-transfer-encoding-defaults): Try to make the documentation clearer. ChangeLog: jidanni -> Dan Jacobson. nnmbox.el (nnmbox-read-mbox): Mark buffer for deletion on Gnus exit. gnus-sum.el, gnus-win.el: Change the `h' command to only show the article buffer. gnus-art.el (gnus-summary-save-in-file, gnus-summary-save-in-rmail): Use with-current-buffer instead of gnus-eval-in-buffer-window to avoid popping up frames. gnus-sum.el (gnus-summary-clear-local-variables): Removed. gnus-async.el (gnus-async-delete-prefetched-entry): Remove from hash table, too. gnus-async.el: Try to keep the async hash table size reasonable. nndoc.el (nndoc-type-alist): Do babyl before mime-parts. gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups we're being queried about. diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-10-01 00:25:50 +0000 +++ doc/misc/gnus.texi 2010-10-01 23:08:25 +0000 @@ -9477,6 +9477,14 @@ corresponding regular expression in @code{gnus-article-banner-alist} is used. +For instance: + +@lisp +(setq gnus-article-banner-alist + ((googleGroups . + "^\n*--~--~---------\\(.+\n\\)+"))) +@end lisp + Regardless of a group, you can hide things like advertisements only when the sender of an article has a certain mail address specified in @code{gnus-article-address-banner-alist}. @@ -15102,6 +15110,9 @@ message. The function should return a list of group names that it thinks should carry this mail message. +This variable can also be a fancy split method. See @xref{Fancy Mail +Splitting} for the syntax. + Note that the mail back ends are free to maul the poor, innocent, incoming headers all they want to. They all add @code{Lines} headers; some add @code{X-Gnus-Group} headers; most rename the Unix mbox === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-01 13:33:03 +0000 +++ lisp/gnus/ChangeLog 2010-10-01 23:08:25 +0000 @@ -1,5 +1,83 @@ 2010-10-01 Lars Magne Ingebrigtsen + * gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups + we're being queried about. Suggested by Dan Jacobson. + + * nndoc.el (nndoc-type-alist): Do babyl before mime-parts. Suggested + by Jason Eisner. + + * gnus-async.el (gnus-async-delete-prefetched-entry): Remove from hash + table, too. Suggested by Stefan Wiens. + (gnus-async-prefetched-article-entry): Use intern-soft to avoid growing + the table unnecessary. Suggested by Stefan Wiens. + + * gnus-sum.el (gnus-summary-clear-local-variables): This is probably no + longer needed, and probably doesn't work either, as pointed out by + Stefan Wiens. + (gnus-summary-exit): Remove call to the clearing function. + (gnus-summary-exit-no-update): Ditto. + + * gnus-art.el (gnus-summary-save-in-file): Use with-current-buffer + instead of gnus-eval-in-buffer-window to avoid popping up frames. + Reported by Stefan Monnier. + (gnus-summary-save-in-rmail): Ditto. + + * gnus-sum.el (gnus-summary-select-article-buffer): Show only the + article buffer, instead of both the article buffer and the summary + buffer. Sort of suggested by Dan Jacobson. + + * gnus-win.el (gnus-buffer-configuration): Add an only-article spec. + + * nnmbox.el (nnmbox-read-mbox): Mark buffer for deletion on Gnus exit. + Suggested by Dan Jacobson. + + * mm-encode.el (mm-content-transfer-encoding-defaults): Try to make the + documentation clearer. + + * message.el (message-shorten-references): Comment on the number "21". + Suggested by Stefan Monnier. + + * gnus-sum.el (gnus-summary-scroll-up): Add more documentation. + Suggested by Dan Jacobson. + + * gnus.el (gnus-large-newsgroup): Mention + gnus-large-ephemeral-newsgroup. Suggested by Dan Jacobson. + + * gnus-msg.el (gnus-summary-resend-message): When resending, don't + externalize attachments. Bug reported by Steve Wen. + + * gnus.el (gnus-continuum-version): Make inactive, since it doesn't + really message anything to the user. + + * nnmail.el (nnmail-article-group): Allow using the fancy split method + directly. + + * nnimap.el (nnimap-request-group): Low higher than high to signal no + messages in empty groups. + +2010-10-01 Ted Zlatanov + + * nnimap.el (nnimap-request-group): Don't bug out when there's an empty + non-UIDNEXT group. + +2010-10-01 Lars Magne Ingebrigtsen + + * gnus-group.el (gnus-group-completing-read): Return the symbol name, + not the value from the collection. + + * nnimap.el (nnimap-update-info): Ignore groups that have no UIDNEXT + values. This sometimes happens on some groups that have no info. + (nnimap-request-newgroups): New function. + +2010-10-01 Teodor Zlatanov + + * gnus-registry.el (gnus-registry-install-nnregistry): Move the feature + check into `gnus-registry-initialize'. + (gnus-registry-initialize): Ditto. + Fix and extend header docs. + +2010-10-01 Lars Magne Ingebrigtsen + * gnus-html.el (gnus-html-prefetch-images): Adjust regexp to avoid regexp backtrace overflows. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-10-01 00:25:50 +0000 +++ lisp/gnus/gnus-art.el 2010-10-01 23:08:25 +0000 @@ -3958,7 +3958,7 @@ "Save %s in rmail file" filename gnus-rmail-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-rmail)) - (gnus-eval-in-buffer-window gnus-save-article-buffer + (with-current-buffer gnus-save-article-buffer (save-excursion (save-restriction (widen) @@ -3976,7 +3976,7 @@ "Save %s in Unix mail file" filename gnus-mail-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-mail)) - (gnus-eval-in-buffer-window gnus-save-article-buffer + (with-current-buffer gnus-save-article-buffer (save-excursion (save-restriction (widen) @@ -3997,7 +3997,7 @@ "Save %s in file" filename gnus-file-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-file)) - (gnus-eval-in-buffer-window gnus-save-article-buffer + (with-current-buffer gnus-save-article-buffer (save-excursion (save-restriction (widen) @@ -4029,7 +4029,7 @@ "Save %s body in file" filename gnus-file-save-name gnus-newsgroup-name gnus-current-headers 'gnus-newsgroup-last-file)) - (gnus-eval-in-buffer-window gnus-save-article-buffer + (with-current-buffer gnus-save-article-buffer (save-excursion (save-restriction (widen) @@ -4108,7 +4108,7 @@ (if default (setq command default) (error "A command is required"))) - (gnus-eval-in-buffer-window save-buffer + (with-current-buffer save-buffer (save-restriction (widen) (shell-command-on-region (point-min) (point-max) command nil))) === modified file 'lisp/gnus/gnus-async.el' --- lisp/gnus/gnus-async.el 2010-09-18 10:02:19 +0000 +++ lisp/gnus/gnus-async.el 2010-10-01 23:08:25 +0000 @@ -316,7 +316,8 @@ (set-marker (caddr entry) nil)) (gnus-async-with-semaphore (setq gnus-async-article-alist - (delq entry gnus-async-article-alist)))) + (delq entry gnus-async-article-alist)) + (unintern (car entry) gnus-async-hashtb))) (defun gnus-async-prefetch-remove-group (group) "Remove all articles belonging to GROUP from the prefetch buffer." @@ -332,8 +333,8 @@ "Return the entry for ARTICLE in GROUP if it has been prefetched." (let ((entry (save-excursion (gnus-async-set-buffer) - (assq (intern (format "%s-%d" group article) - gnus-async-hashtb) + (assq (intern-soft (format "%s-%d" group article) + gnus-async-hashtb) gnus-async-article-alist)))) ;; Perhaps something has emptied the buffer? (if (and entry === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/gnus-group.el 2010-10-01 23:08:25 +0000 @@ -2170,21 +2170,21 @@ The arguments are the same as `completing-read' except that COLLECTION and HIST default to `gnus-active-hashtb' and `gnus-group-history' respectively if they are omitted." - (let* ((choices (mapcar (lambda (symbol) + (let* ((collection (or collection (or gnus-active-hashtb [0]))) + (choices (mapcar (lambda (symbol) (let ((group (symbol-name symbol))) (if (string-match "[^\000-\177]" group) (gnus-group-decoded-name group) group))) - (remove-if-not - 'symbolp - (or collection (or gnus-active-hashtb [0]))))) + (remove-if-not 'symbolp collection))) (group (gnus-completing-read (or prompt "Group") choices require-match initial-input (or hist 'gnus-group-history) def))) - (or (symbol-value (intern-soft group collection)) - (mm-encode-coding-string group (gnus-group-name-charset nil group))))) + (if (symbol-value (intern-soft group collection)) + group + (mm-encode-coding-string group (gnus-group-name-charset nil group))))) ;;;###autoload (defun gnus-fetch-group (group &optional articles) === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/gnus-msg.el 2010-10-01 23:08:25 +0000 @@ -1265,7 +1265,8 @@ (dolist (article (gnus-summary-work-articles n)) (gnus-summary-select-article nil nil nil article) (with-current-buffer gnus-original-article-buffer - (message-resend address)) + (let ((gnus-gcc-externalize-attachments nil)) + (message-resend address))) (gnus-summary-mark-article-as-forwarded article))) ;; From: Matthieu Moy === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2010-10-01 00:25:50 +0000 +++ lisp/gnus/gnus-registry.el 2010-10-01 23:08:25 +0000 @@ -36,10 +36,12 @@ ;; Put this in your startup file (~/.gnus.el for instance) +;; (require 'nnregistry) ;; optional, or see below (automatically calls `gnus-registry-install-nnregistry' when `gnus-registry-initialize' is called) ;; (setq gnus-registry-max-entries 2500 ;; gnus-registry-use-long-group-names t) ;; (gnus-registry-initialize) +;; (gnus-registry-install-nnregistry) ;; optional, or see above (loading nnregistry makes it unnecessary) ;; Then use this in your fancy-split: @@ -1129,7 +1131,8 @@ (setq gnus-registry-install t) ; in case it was 'ask or nil (gnus-registry-install-hooks) (gnus-registry-install-shortcuts) - (gnus-registry-install-nnregistry) + (when (featurep 'nnregistry) + (gnus-registry-install-nnregistry)) (gnus-registry-read)) ;;;###autoload @@ -1150,14 +1153,13 @@ (defun gnus-registry-install-nnregistry () "Install the nnregistry refer method in `gnus-refer-article-method'." (interactive) - (when (featurep 'nnregistry) - (setq gnus-refer-article-method - (delete-dups - (append - (if (listp gnus-refer-article-method) - gnus-refer-article-method - (list gnus-refer-article-method)) - (list 'nnregistry)))))) + (setq gnus-refer-article-method + (delete-dups + (append + (if (listp gnus-refer-article-method) + gnus-refer-article-method + (list gnus-refer-article-method)) + (list 'nnregistry))))) (defun gnus-registry-unload-hook () "Uninstall the registry hooks." === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2010-09-26 04:03:19 +0000 +++ lisp/gnus/gnus-start.el 2010-10-01 23:08:25 +0000 @@ -1465,7 +1465,7 @@ (push group bogus))) (if confirm (map-y-or-n-p - "Remove bogus group %s? " + (format "Remove bogus group %%s (of %d groups)? " (length bogus)) (lambda (group) ;; Remove all bogus subscribed groups by first killing them, and ;; then removing them from the list of killed groups. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-10-01 00:25:50 +0000 +++ lisp/gnus/gnus-sum.el 2010-10-01 23:08:25 +0000 @@ -3109,16 +3109,6 @@ ;; Simple nil-valued local variable. (set (make-local-variable local) nil))))) -(defun gnus-summary-clear-local-variables () - (let ((locals gnus-summary-local-variables)) - (while locals - (if (consp (car locals)) - (and (symbolp (caar locals)) - (set (caar locals) nil)) - (and (symbolp (car locals)) - (set (car locals) nil))) - (setq locals (cdr locals))))) - ;; Summary data functions. (defmacro gnus-data-number (data) @@ -6939,12 +6929,12 @@ ;; Various summary commands (defun gnus-summary-select-article-buffer () - "Reconfigure windows to show article buffer." + "Reconfigure windows to show the article buffer." (interactive) (if (not (gnus-buffer-live-p gnus-article-buffer)) (error "There is no article buffer for this summary buffer") - (gnus-configure-windows 'article) - (select-window (get-buffer-window gnus-article-buffer)))) + (select-window (get-buffer-window gnus-article-buffer)) + (gnus-configure-windows 'only-article t))) (defun gnus-summary-universal-argument (arg) "Perform any operation on all articles that are process/prefixed." @@ -7129,13 +7119,6 @@ (progn (gnus-deaden-summary) (setq mode nil)) - ;; We set all buffer-local variables to nil. It is unclear why - ;; this is needed, but if we don't, buffer-local variables are - ;; not garbage-collected, it seems. This would the lead to en - ;; ever-growing Emacs. - (gnus-summary-clear-local-variables) - (let ((gnus-summary-local-variables gnus-newsgroup-variables)) - (gnus-summary-clear-local-variables)) (when (get-buffer gnus-article-buffer) (bury-buffer gnus-article-buffer)) ;; Return to group mode buffer. @@ -7194,9 +7177,6 @@ (if (not gnus-kill-summary-on-exit) (gnus-deaden-summary) (gnus-close-group group) - (gnus-summary-clear-local-variables) - (let ((gnus-summary-local-variables gnus-newsgroup-variables)) - (gnus-summary-clear-local-variables)) (gnus-kill-buffer gnus-summary-buffer)) (unless gnus-single-article-buffer (setq gnus-article-current nil)) @@ -7844,7 +7824,8 @@ (defun gnus-summary-scroll-up (lines) "Scroll up (or down) one line current article. -Argument LINES specifies lines to be scrolled up (or down if negative)." +Argument LINES specifies lines to be scrolled up (or down if negative). +If no article is selected, then the current article will be selected first." (interactive "p") (gnus-configure-windows 'article) (gnus-summary-show-thread) @@ -7860,7 +7841,8 @@ (defun gnus-summary-scroll-down (lines) "Scroll down (or up) one line current article. -Argument LINES specifies lines to be scrolled down (or up if negative)." +Argument LINES specifies lines to be scrolled down (or up if negative). +If no article is selected, then the current article will be selected first." (interactive "p") (gnus-summary-scroll-up (- lines))) === modified file 'lisp/gnus/gnus-win.el' --- lisp/gnus/gnus-win.el 2010-09-02 00:55:51 +0000 +++ lisp/gnus/gnus-win.el 2010-10-01 23:08:25 +0000 @@ -107,6 +107,9 @@ (vertical 1.0 (summary 0.25) (faq 1.0 point))) + (only-article + (vertical 1.0 + (article 1.0 point))) (edit-article (vertical 1.0 (article 1.0 point))) === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2010-10-01 00:25:50 +0000 +++ lisp/gnus/gnus.el 2010-10-01 23:08:25 +0000 @@ -1491,7 +1491,9 @@ "*The number of articles which indicates a large newsgroup. If the number of articles in a newsgroup is greater than this value, confirmation is required for selecting the newsgroup. -If it is nil, no confirmation is required." +If it is nil, no confirmation is required. + +Also see `gnus-large-ephemeral-newsgroup'." :group 'gnus-group-select :type '(choice (const :tag "No limit" nil) integer)) @@ -3206,7 +3208,6 @@ (defun gnus-continuum-version (&optional version) "Return VERSION as a floating point number." - (interactive) (unless version (setq version gnus-version)) (when (or (string-match "^\\([^ ]+\\)? ?Gnus v?\\([0-9.]+\\)$" version) === modified file 'lisp/gnus/mailcap.el' --- lisp/gnus/mailcap.el 2010-09-22 06:01:22 +0000 +++ lisp/gnus/mailcap.el 2010-10-01 23:08:25 +0000 @@ -812,7 +812,10 @@ ;;; (defvar mailcap-mime-extensions - '(("" . "text/plain") + '(("" . "text/plain") + (".1" . "text/plain") ;; Manual pages + (".3" . "text/plain") + (".8" . "text/plain") (".abs" . "audio/x-mpeg") (".aif" . "audio/aiff") (".aifc" . "audio/aiff") @@ -828,6 +831,7 @@ (".css" . "text/css") (".dvi" . "application/x-dvi") (".diff" . "text/x-patch") + (".dpatch". "test/x-patch") (".el" . "application/emacs-lisp") (".eps" . "application/postscript") (".etx" . "text/x-setext") @@ -869,6 +873,7 @@ (".pict" . "image/pict") (".png" . "image/png") (".pnm" . "image/x-portable-anymap") + (".pod" . "text/plain") (".ppm" . "image/portable-pixmap") (".ps" . "application/postscript") (".qt" . "video/quicktime") === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-10-01 00:25:50 +0000 +++ lisp/gnus/message.el 2010-10-01 23:08:25 +0000 @@ -6049,6 +6049,7 @@ When sending via news, also check that the REFERENCES are less than 988 characters long, and if they are not, trim them until they are." + ;; 21 is the number suggested by USEAGE. (let ((maxcount 21) (count 0) (cut 2) === modified file 'lisp/gnus/mm-encode.el' --- lisp/gnus/mm-encode.el 2010-09-02 00:55:51 +0000 +++ lisp/gnus/mm-encode.el 2010-10-01 23:08:25 +0000 @@ -42,15 +42,8 @@ If the encoding is `qp-or-base64', then either quoted-printable or base64 will be used, depending on what is more efficient. -`qp-or-base64' has another effect. It will fold long lines so that -MIME parts may not be broken by MTA. So do `quoted-printable' and -`base64'. - -Note: It affects body encoding only when a part is a raw forwarded -message (which will be made by `gnus-summary-mail-forward' with the -arg 2 for example) or is neither the text/* type nor the message/* -type. Even though in those cases, you can use the `encoding' MML tag -to specify encoding of non-ASCII MIME parts." +This list is only consulted when encoding MIME parts in the +bodies -- not for the regular non-MIME-ish messages." :type '(repeat (list (regexp :tag "MIME type") (choice :tag "encoding" (const 7bit) === modified file 'lisp/gnus/nndoc.el' --- lisp/gnus/nndoc.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/nndoc.el 2010-10-01 23:08:25 +0000 @@ -74,14 +74,14 @@ (mbox (article-begin-function . nndoc-mbox-article-begin) (body-end-function . nndoc-mbox-body-end)) - (mime-parts - (generate-head-function . nndoc-generate-mime-parts-head) - (article-transform-function . nndoc-transform-mime-parts)) (babyl (article-begin . "\^_\^L *\n") (body-end . "\^_") (body-begin-function . nndoc-babyl-body-begin) (head-begin-function . nndoc-babyl-head-begin)) + (mime-parts + (generate-head-function . nndoc-generate-mime-parts-head) + (article-transform-function . nndoc-transform-mime-parts)) (exim-bounce (article-begin . "^------ This is a copy of the message, including all the headers. ------\n\n") (body-end-function . nndoc-exim-bounce-body-end-function)) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-10-01 12:56:44 +0000 +++ lisp/gnus/nnimap.el 2010-10-01 23:08:25 +0000 @@ -623,10 +623,11 @@ (nnimap-update-infos marks (list info))) (goto-char (point-max)) (let ((uidnext (nth 5 (car marks)))) - (setq high (if uidnext - (1- uidnext) - (nth 3 (car marks))) - low (or (nth 4 (car marks)) uidnext))))) + (setq high (or (if uidnext + (1- uidnext) + (nth 3 (car marks))) + 0) + low (or (nth 4 (car marks)) uidnext 1))))) (erase-buffer) (insert (format @@ -912,6 +913,16 @@ (or highest exists))))))))) t)))) +(deffoo nnimap-request-newgroups (date &optional server) + (nnimap-possibly-change-group nil server) + (with-current-buffer nntp-server-buffer + (erase-buffer) + (dolist (group (with-current-buffer (nnimap-buffer) + (nnimap-get-groups))) + (unless (assoc group nnimap-current-infos) + ;; Insert dummy numbers here -- they don't matter. + (insert (format "%S 0 1 y\n" group)))))) + (deffoo nnimap-retrieve-group-data-early (server infos) (when (nnimap-possibly-change-group nil server) (with-current-buffer (nnimap-buffer) @@ -990,7 +1001,9 @@ (nnimap-update-info info (cdr (assoc group flags)))))) (defun nnimap-update-info (info marks) - (when marks + (when (and marks + ;; Ignore groups with no UIDNEXT values. + (nth 4 marks)) (destructuring-bind (existing flags high low uidnext start-article permanent-flags) marks (let ((group (gnus-info-group info)) === modified file 'lisp/gnus/nnmail.el' --- lisp/gnus/nnmail.el 2010-09-29 13:38:27 +0000 +++ lisp/gnus/nnmail.el 2010-10-01 23:08:25 +0000 @@ -104,7 +104,9 @@ The last element should always have \"\" as the regexp. -This variable can also have a function as its value." +This variable can also have a function as its value, and it can +also have a fancy split method as its value. See +`nnmail-split-fancy' for an explanation of that syntax." :group 'nnmail-split :type '(choice (repeat :tag "Alist" (group (string :tag "Name") (choice regexp function))) @@ -1145,21 +1147,33 @@ (run-hooks 'nnmail-split-hook) (when (setq nnmail-split-tracing trace) (setq nnmail-split-trace nil)) - (if (and (symbolp nnmail-split-methods) - (fboundp nnmail-split-methods)) - (let ((split - (condition-case error-info - ;; `nnmail-split-methods' is a function, so we - ;; just call this function here and use the - ;; result. - (or (funcall nnmail-split-methods) - (and (not nnmail-inhibit-default-split-group) - '("bogus"))) - (error - (nnheader-message - 5 "Error in `nnmail-split-methods'; using `bogus' mail group: %S" error-info) - (sit-for 1) - '("bogus"))))) + (if (or (and (symbolp nnmail-split-methods) + (fboundp nnmail-split-methods)) + (and (listp nnmail-split-methods) + ;; Not a regular split method, so it has to be a + ;; fancy one. + (not (let ((top-element (car-safe nnmail-split-methods))) + (and (= 2 (length top-element)) + (stringp (nth 0 top-element)) + (stringp (nth 1 top-element))))))) + (let* ((method-function + (if (and (symbolp nnmail-split-methods) + (fboundp nnmail-split-methods)) + nnmail-split-methods + 'nnmail-split-fancy)) + (split + (condition-case error-info + ;; `nnmail-split-methods' is a function, so we + ;; just call this function here and use the + ;; result. + (or (funcall method-function) + (and (not nnmail-inhibit-default-split-group) + '("bogus"))) + (error + (nnheader-message + 5 "Error in `nnmail-split-methods'; using `bogus' mail group: %S" error-info) + (sit-for 1) + '("bogus"))))) (setq split (mm-delete-duplicates split)) ;; The article may be "cross-posted" to `junk'. What ;; to do? Just remove the `junk' spec. Don't really === modified file 'lisp/gnus/nnmbox.el' --- lisp/gnus/nnmbox.el 2010-09-18 23:36:29 +0000 +++ lisp/gnus/nnmbox.el 2010-10-01 23:08:25 +0000 @@ -640,6 +640,7 @@ nnmbox-mbox-file t t)))) (mm-enable-multibyte) (buffer-disable-undo) + (gnus-add-buffer) ;; Go through the group alist and compare against the mbox file. (while alist ------------------------------------------------------------ revno: 101716 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-10-01 22:18:24 +0200 message: Fix initial frame dimensions on MS-DOS. term.c (init_tty) [DOS_NT]: Don't call Wcm_clear after setting screen dimensions in tty->Wcm. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 17:38:36 +0000 +++ src/ChangeLog 2010-10-01 20:18:24 +0000 @@ -1,5 +1,8 @@ 2010-10-01 Eli Zaretskii + * term.c (init_tty) [DOS_NT]: Don't call Wcm_clear after setting + screen dimensions in tty->Wcm. + * xdisp.c (set_cursor_from_row): When the row is truncated and point is outside the range of displayed characters, position the cursor inside the scroll margin. (Bug#6349) === modified file 'src/term.c' --- src/term.c 2010-10-01 13:56:33 +0000 +++ src/term.c 2010-10-01 20:18:24 +0000 @@ -3657,9 +3657,6 @@ add_keyboard_wait_descriptor (0); - /* FIXME: this should be removed, done earlier. */ - Wcm_clear (tty); - tty->delete_in_insert_mode = 1; UseTabs (tty) = 0; ------------------------------------------------------------ revno: 101715 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-10-01 21:20:29 +0200 message: Fix the MSDOS build broken by revno 101631. sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): Edit to empty. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-09-22 09:45:26 +0000 +++ msdos/ChangeLog 2010-10-01 19:20:29 +0000 @@ -1,3 +1,7 @@ +2010-10-01 Eli Zaretskii + + * sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): Edit to empty. + 2010-09-22 Eli Zaretskii * sed1v2.inp (LINKER): Don't edit, variable was removed from === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-09-22 09:45:26 +0000 +++ msdos/sed1v2.inp 2010-10-01 19:20:29 +0000 @@ -104,6 +104,8 @@ /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// +/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// +/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// /^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// ------------------------------------------------------------ revno: 101714 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-10-01 19:38:36 +0200 message: Fix bug #6349 with cursor positioning in truncated lines. xdisp.c (set_cursor_from_row): When the row is truncated and point is outside the range of displayed characters, position the cursor inside the scroll margin. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 13:56:33 +0000 +++ src/ChangeLog 2010-10-01 17:38:36 +0000 @@ -1,3 +1,9 @@ +2010-10-01 Eli Zaretskii + + * xdisp.c (set_cursor_from_row): When the row is truncated and + point is outside the range of displayed characters, position the + cursor inside the scroll margin. (Bug#6349) + 2010-10-01 Dan Nicolaescu Do not include stdlib.h and string.h, config.h does it. === modified file 'src/xdisp.c' --- src/xdisp.c 2010-09-29 09:52:43 +0000 +++ src/xdisp.c 2010-10-01 17:38:36 +0000 @@ -12494,8 +12494,10 @@ /* Non-zero means we've seen at least one glyph that came from a display string. */ int string_seen = 0; - /* Largest buffer position seen so far during scan of glyph row. */ - EMACS_INT bpos_max = last_pos; + /* Largest and smalles buffer positions seen so far during scan of + glyph row. */ + EMACS_INT bpos_max = pos_before; + EMACS_INT bpos_min = pos_after; /* Last buffer position covered by an overlay string with an integer `cursor' property. */ EMACS_INT bpos_covered = 0; @@ -12585,6 +12587,8 @@ if (glyph->charpos > bpos_max) bpos_max = glyph->charpos; + if (glyph->charpos < bpos_min) + bpos_min = glyph->charpos; if (!glyph->avoid_cursor_p) { /* If we hit point, we've found the glyph on which to @@ -12659,6 +12663,8 @@ if (glyph->charpos > bpos_max) bpos_max = glyph->charpos; + if (glyph->charpos < bpos_min) + bpos_min = glyph->charpos; if (!glyph->avoid_cursor_p) { if (dpos == 0) @@ -12745,7 +12751,13 @@ } } else if (match_with_avoid_cursor - /* zero-width characters produce no glyphs */ + /* A truncated row may not include PT among its + character positions. Setting the cursor inside the + scroll margin will trigger recalculation of hscroll + in hscroll_window_tree. */ + || (row->truncated_on_left_p && pt_old < bpos_min) + || (row->truncated_on_right_p && pt_old > bpos_max) + /* Zero-width characters produce no glyphs. */ || ((row->reversed_p ? glyph_after > glyphs_end : glyph_after < glyphs_end) ------------------------------------------------------------ revno: 101713 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2010-10-01 16:49:14 +0200 message: Use url-lazy-message for warnings about ignored cookies. These messages aren't very interesting for most users. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-10-01 14:05:25 +0000 +++ lisp/url/ChangeLog 2010-10-01 14:49:14 +0000 @@ -1,5 +1,8 @@ 2010-10-01 Lars Magne Ingebrigtsen + * url-cookie.el (url-cookie-handle-set-cookie): Use + url-lazy-message for the cookie warning, which isn't very interesting. + * url-http.el (url-http-async-sentinel): Check that the buffer is still alive before switching to it. === modified file 'lisp/url/url-cookie.el' --- lisp/url/url-cookie.el 2010-09-09 05:38:43 +0000 +++ lisp/url/url-cookie.el 2010-10-01 14:49:14 +0000 @@ -400,8 +400,8 @@ (url-cookie-store (car cur) (cdr cur) expires domain localpart secure)))) (t - (message "%s tried to set a cookie for domain %s - rejected." - (url-host url-current-object) domain))))) + (url-lazy-message "%s tried to set a cookie for domain %s - rejected." + (url-host url-current-object) domain))))) (defvar url-cookie-timer nil) ------------------------------------------------------------ revno: 101712 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Fri 2010-10-01 16:05:25 +0200 message: (url-http-async-sentinel): Check that the buffer is still alive before switching to it. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-09-25 20:59:05 +0000 +++ lisp/url/ChangeLog 2010-10-01 14:05:25 +0000 @@ -1,3 +1,8 @@ +2010-10-01 Lars Magne Ingebrigtsen + + * url-http.el (url-http-async-sentinel): Check that the buffer is + still alive before switching to it. + 2010-09-25 Julien Danjou * url-cache.el (url-cache-create-filename): Ensure no-port and === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2010-07-27 02:10:05 +0000 +++ lisp/url/url-http.el 2010-10-01 14:05:25 +0000 @@ -1244,20 +1244,21 @@ (declare (special url-callback-arguments)) ;; We are performing an asynchronous connection, and a status change ;; has occurred. - (with-current-buffer (process-buffer proc) - (cond - (url-http-connection-opened - (url-http-end-of-document-sentinel proc why)) - ((string= (substring why 0 4) "open") - (setq url-http-connection-opened t) - (process-send-string proc (url-http-create-request))) - (t - (setf (car url-callback-arguments) - (nconc (list :error (list 'error 'connection-failed why - :host (url-host (or url-http-proxy url-current-object)) - :service (url-port (or url-http-proxy url-current-object)))) - (car url-callback-arguments))) - (url-http-activate-callback))))) + (when (buffer-name (process-buffer proc)) + (with-current-buffer (process-buffer proc) + (cond + (url-http-connection-opened + (url-http-end-of-document-sentinel proc why)) + ((string= (substring why 0 4) "open") + (setq url-http-connection-opened t) + (process-send-string proc (url-http-create-request))) + (t + (setf (car url-callback-arguments) + (nconc (list :error (list 'error 'connection-failed why + :host (url-host (or url-http-proxy url-current-object)) + :service (url-port (or url-http-proxy url-current-object)))) + (car url-callback-arguments))) + (url-http-activate-callback)))))) ;; Since Emacs 19/20 does not allow you to change the ;; `after-change-functions' hook in the midst of running them, we fake ------------------------------------------------------------ revno: 101711 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-10-01 06:56:33 -0700 message: Do not include stdlib.h and string.h, config.h does it. * src/xfont.c: * src/w32term.c: * src/w32reg.c: * src/w32inevt.c: * src/w32heap.c: * src/w32console.c: * src/w16select.c: * src/unexsol.c: * src/term.c: * src/sound.c: * src/scroll.c (m): * src/gtkutil.c: * src/font.c: * src/filelock.c: * src/fileio.c: * src/dosfns.c: * src/dbusbind.c: * src/bidi.c: * src/callproc.c: * src/process.c: * src/msdos.c: * src/charset.c: Do not include stdlib.h and string.h, config.h does it. * configure.in: Include stdlib.h and string.h unconditionally. diff: === modified file 'ChangeLog' --- ChangeLog 2010-09-29 18:52:34 +0000 +++ ChangeLog 2010-10-01 13:56:33 +0000 @@ -1,3 +1,7 @@ +2010-10-01 Dan Nicolaescu + + * configure.in: Include stdlib.h and string.h unconditionally. + 2010-09-29 Romain Francoise * configure.in: Don't enable ImageMagick unless HAVE_X11. === modified file 'configure.in' --- configure.in 2010-09-29 18:52:34 +0000 +++ configure.in 2010-10-01 13:56:33 +0000 @@ -3607,13 +3607,8 @@ not define __STDC__ (e.g. DEC C by default) or may define it as zero. */ #undef PROTOTYPES -#ifdef HAVE_STRING_H #include -#endif - -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_ALLOCA_H # include === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 13:06:44 +0000 +++ src/ChangeLog 2010-10-01 13:56:33 +0000 @@ -1,5 +1,29 @@ 2010-10-01 Dan Nicolaescu + Do not include stdlib.h and string.h, config.h does it. + * xfont.c: + * w32term.c: + * w32reg.c: + * w32inevt.c: + * w32heap.c: + * w32console.c: + * w16select.c: + * unexsol.c: + * term.c: + * sound.c: + * scroll.c (m): + * gtkutil.c: + * font.c: + * filelock.c: + * fileio.c: + * dosfns.c: + * dbusbind.c: + * bidi.c: + * callproc.c: + * process.c: + * msdos.c: + * charset.c: Do not include stdlib.h and string.h, config.h does it. + * callproc.c (SIGCHLD): Remove conditional definition, syssignal.h defines it. * process.c: Move #include earlier. @@ -10,6 +34,7 @@ * nsmenu.m (syms_of_nsmenu): * nsfns.m (syms_of_nsfns): * msdos.c (syms_of_msdos): + * image.c (syms_of_image): * charset.c (syms_of_charset): Use intern_c_string instead of intern. === modified file 'src/bidi.c' --- src/bidi.c 2010-09-24 13:05:24 +0000 +++ src/bidi.c 2010-10-01 13:56:33 +0000 @@ -51,7 +51,6 @@ #include #include -#include #include #include "lisp.h" === modified file 'src/callproc.c' --- src/callproc.c 2010-10-01 13:06:44 +0000 +++ src/callproc.c 2010-10-01 13:56:33 +0000 @@ -38,7 +38,6 @@ #ifdef WINDOWSNT #define NOMINMAX #include -#include /* for proper declaration of environ */ #include #include "w32.h" #define _P_NOWAIT 1 /* from process.h */ === modified file 'src/charset.c' --- src/charset.c 2010-10-01 12:25:21 +0000 +++ src/charset.c 2010-10-01 13:56:33 +0000 @@ -28,7 +28,6 @@ #include #include -#include #include #include #include === modified file 'src/config.in' --- src/config.in 2010-09-26 06:06:28 +0000 +++ src/config.in 2010-10-01 13:56:33 +0000 @@ -1170,13 +1170,8 @@ not define __STDC__ (e.g. DEC C by default) or may define it as zero. */ #undef PROTOTYPES -#ifdef HAVE_STRING_H #include -#endif - -#ifdef HAVE_STDLIB_H #include -#endif #ifdef HAVE_ALLOCA_H # include === modified file 'src/dbusbind.c' --- src/dbusbind.c 2010-09-27 23:25:27 +0000 +++ src/dbusbind.c 2010-10-01 13:56:33 +0000 @@ -19,7 +19,6 @@ #include #ifdef HAVE_DBUS -#include #include #include #include === modified file 'src/dosfns.c' --- src/dosfns.c 2010-08-13 09:21:31 +0000 +++ src/dosfns.c 2010-10-01 13:56:33 +0000 @@ -24,7 +24,6 @@ /* The entire file is within this conditional */ #include -#include #include #include #include "lisp.h" === modified file 'src/fileio.c' --- src/fileio.c 2010-09-12 14:35:37 +0000 +++ src/fileio.c 2010-10-01 13:56:33 +0000 @@ -71,7 +71,6 @@ #ifdef WINDOWSNT #define NOMINMAX 1 #include -#include #include #endif /* not WINDOWSNT */ @@ -79,7 +78,6 @@ #include "msdos.h" #include #include -#include #endif #ifdef DOS_NT === modified file 'src/filelock.c' --- src/filelock.c 2010-08-09 09:35:21 +0000 +++ src/filelock.c 2010-10-01 13:56:33 +0000 @@ -34,7 +34,6 @@ #ifdef HAVE_FCNTL_H #include #endif -#include #ifdef HAVE_UNISTD_H #include === modified file 'src/font.c' --- src/font.c 2010-09-23 12:09:12 +0000 +++ src/font.c 2010-10-01 13:56:33 +0000 @@ -21,7 +21,6 @@ #include #include -#include #include #include === modified file 'src/gtkutil.c' --- src/gtkutil.c 2010-09-23 19:00:31 +0000 +++ src/gtkutil.c 2010-10-01 13:56:33 +0000 @@ -20,7 +20,6 @@ #include #ifdef USE_GTK -#include #include #include #include === modified file 'src/msdos.c' --- src/msdos.c 2010-10-01 12:25:21 +0000 +++ src/msdos.c 2010-10-01 13:56:33 +0000 @@ -29,13 +29,11 @@ #include #include "lisp.h" #include -#include #include #include #include #include #include -#include /* for memset and string functions */ #include /* for _fixpath */ #include /* for chdir, dup, dup2, etc. */ #include /* for getdisk */ === modified file 'src/process.c' --- src/process.c 2010-10-01 13:04:07 +0000 +++ src/process.c 2010-10-01 13:56:33 +0000 @@ -31,7 +31,6 @@ #ifdef HAVE_INTTYPES_H #include #endif -#include #ifdef HAVE_UNISTD_H #include === modified file 'src/scroll.c' --- src/scroll.c 2010-09-24 15:20:58 +0000 +++ src/scroll.c 2010-10-01 13:56:33 +0000 @@ -20,7 +20,6 @@ #include #include -#include #include #include "lisp.h" #include "termchar.h" === modified file 'src/sound.c' --- src/sound.c 2010-08-09 19:25:41 +0000 +++ src/sound.c 2010-10-01 13:56:33 +0000 @@ -86,8 +86,6 @@ /* BEGIN: Windows Specific Includes */ #include -#include -#include #include #include #include === modified file 'src/term.c' --- src/term.c 2010-09-27 05:42:43 +0000 +++ src/term.c 2010-10-01 13:56:33 +0000 @@ -23,7 +23,6 @@ #include #include #include -#include #include #include === modified file 'src/unexsol.c' --- src/unexsol.c 2010-01-04 05:35:18 +0000 +++ src/unexsol.c 2010-10-01 13:56:33 +0000 @@ -1,7 +1,6 @@ /* Trivial unexec for Solaris. */ #include -#include #include #include === modified file 'src/w16select.c' --- src/w16select.c 2010-08-13 09:21:31 +0000 +++ src/w16select.c 2010-10-01 13:56:33 +0000 @@ -28,7 +28,6 @@ #ifdef MSDOS #include -#include #include #include #include === modified file 'src/w32console.c' --- src/w32console.c 2010-09-30 00:09:04 +0000 +++ src/w32console.c 2010-10-01 13:56:33 +0000 @@ -25,10 +25,8 @@ #include -#include #include #include -#include #include #include "lisp.h" === modified file 'src/w32heap.c' --- src/w32heap.c 2010-07-06 14:22:29 +0000 +++ src/w32heap.c 2010-10-01 13:56:33 +0000 @@ -25,7 +25,6 @@ #include #endif -#include #include #include === modified file 'src/w32inevt.c' --- src/w32inevt.c 2010-07-07 09:45:28 +0000 +++ src/w32inevt.c 2010-10-01 13:56:33 +0000 @@ -27,7 +27,6 @@ #include #endif -#include #include #include #include === modified file 'src/w32reg.c' --- src/w32reg.c 2010-07-06 14:22:29 +0000 +++ src/w32reg.c 2010-10-01 13:56:33 +0000 @@ -26,7 +26,6 @@ #include "blockinput.h" #include -#include #define REG_ROOT "SOFTWARE\\GNU\\Emacs" === modified file 'src/w32term.c' --- src/w32term.c 2010-08-18 16:42:06 +0000 +++ src/w32term.c 2010-10-01 13:56:33 +0000 @@ -21,7 +21,6 @@ #include #include #include -#include #include #include "lisp.h" #include "blockinput.h" === modified file 'src/xfont.c' --- src/xfont.c 2010-08-08 21:03:45 +0000 +++ src/xfont.c 2010-10-01 13:56:33 +0000 @@ -21,7 +21,6 @@ #include #include -#include #include #include ------------------------------------------------------------ revno: 101710 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-01 13:33:03 +0000 message: gnus-html.el (gnus-html-prefetch-images): Adjust regexp to avoid regexp backtrace overflows. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-01 12:56:44 +0000 +++ lisp/gnus/ChangeLog 2010-10-01 13:33:03 +0000 @@ -1,5 +1,8 @@ 2010-10-01 Lars Magne Ingebrigtsen + * gnus-html.el (gnus-html-prefetch-images): Adjust regexp to avoid + regexp backtrace overflows. + * nnimap.el (nnimap-extend-tls-programs): Only extend those programs for starttls that tls.el implements; i.e. openssl. === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-10-01 11:15:10 +0000 +++ lisp/gnus/gnus-html.el 2010-10-01 13:33:03 +0000 @@ -500,7 +500,7 @@ (let ((blocked-images (with-current-buffer summary gnus-blocked-images))) (save-match-data - (while (re-search-forward "]+src=[\"']\\([^\"']+\\)" nil t) (let ((url (gnus-html-encode-url (match-string 1)))) (unless (gnus-html-image-url-blocked-p url blocked-images) (when (gnus-html-cache-expired url gnus-html-image-cache-ttl) ------------------------------------------------------------ revno: 101709 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-10-01 06:06:44 -0700 message: * src/callproc.c (SIGCHLD): Remove conditional definition, syssignal.h defines it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 13:04:07 +0000 +++ src/ChangeLog 2010-10-01 13:06:44 +0000 @@ -1,5 +1,7 @@ 2010-10-01 Dan Nicolaescu + * callproc.c (SIGCHLD): Remove conditional definition, syssignal.h defines it. + * process.c: Move #include earlier. (SIGCHLD): Remove conditional definition, syssignal.h defines it. (pty_name): Move definition later. === modified file 'src/callproc.c' --- src/callproc.c 2010-09-24 13:32:25 +0000 +++ src/callproc.c 2010-10-01 13:06:44 +0000 @@ -24,13 +24,6 @@ #include #include #include - -/* Define SIGCHLD as an alias for SIGCLD. */ - -#if !defined (SIGCHLD) && defined (SIGCLD) -#define SIGCHLD SIGCLD -#endif /* SIGCLD */ - #include #ifdef HAVE_UNISTD_H ------------------------------------------------------------ revno: 101708 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-10-01 06:04:07 -0700 message: Small process.c cleanups. * src/process.c: Move #include earlier. (SIGCHLD): Remove conditional definition, syssignal.h defines it. (pty_name): Move definition later. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 12:25:21 +0000 +++ src/ChangeLog 2010-10-01 13:04:07 +0000 @@ -1,5 +1,9 @@ 2010-10-01 Dan Nicolaescu + * process.c: Move #include earlier. + (SIGCHLD): Remove conditional definition, syssignal.h defines it. + (pty_name): Move definition later. + * nsselect.m (syms_of_nsselect): * nsmenu.m (syms_of_nsmenu): * nsfns.m (syms_of_nsfns): === modified file 'src/process.c' --- src/process.c 2010-09-29 12:48:29 +0000 +++ src/process.c 2010-10-01 13:04:07 +0000 @@ -82,6 +82,10 @@ #include #endif +#ifdef HAVE_PTY_H +#include +#endif + #endif /* subprocesses */ #include "lisp.h" @@ -171,13 +175,6 @@ /* Define first descriptor number available for subprocesses. */ #define FIRST_PROC_DESC 3 -/* Define SIGCHLD as an alias for SIGCLD. There are many conditionals - testing SIGCHLD. */ - -#if !defined (SIGCHLD) && defined (SIGCLD) -#define SIGCHLD SIGCLD -#endif /* SIGCLD */ - extern const char *get_operating_system_release (void); /* From sysdep.c or w32.c */ @@ -356,14 +353,6 @@ /* Maximum number of bytes to send to a pty without an eof. */ static int pty_max_bytes; -#ifdef HAVE_PTYS -#ifdef HAVE_PTY_H -#include -#endif -/* The file name of the pty opened by allocate_pty. */ - -static char pty_name[24]; -#endif struct fd_callback_data @@ -563,6 +552,9 @@ #ifdef HAVE_PTYS +/* The file name of the pty opened by allocate_pty. */ +static char pty_name[24]; + /* Open an available pty, returning a file descriptor. Return -1 on failure. The file name of the terminal corresponding to the pty ------------------------------------------------------------ revno: 101707 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-01 12:56:44 +0000 message: Give up on using gnutls-cli for starttls. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-01 11:45:16 +0000 +++ lisp/ChangeLog 2010-10-01 12:56:44 +0000 @@ -1,3 +1,10 @@ +2010-10-01 Lars Magne Ingebrigtsen + + * net/tls.el (tls-starttls-switches): Give up on using starttls with + gnutls-cli. + (tls-program): Add --insecure to be consistent with the defaults from + openssl s_client. Now all three commands are insecure. + 2010-10-01 Eli Zaretskii * makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-01 11:15:10 +0000 +++ lisp/gnus/ChangeLog 2010-10-01 12:56:44 +0000 @@ -1,3 +1,8 @@ +2010-10-01 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-extend-tls-programs): Only extend those programs + for starttls that tls.el implements; i.e. openssl. + 2010-10-01 Katsumi Yamaoka * gravatar.el: Don't load image.el that XEmacs doesn't provide. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-10-01 00:25:50 +0000 +++ lisp/gnus/nnimap.el 2010-10-01 12:56:44 +0000 @@ -404,7 +404,11 @@ (unless (consp programs) (setq programs (list programs))) (dolist (program programs) - (push (concat program " " "%s") result)) + (when (assoc (car (split-string program)) tls-starttls-switches) + (push (if (not (string-match "%s" program)) + (concat program " " "%s") + program) + result))) (nreverse result))) (defun nnimap-find-parameter (parameter elems) === modified file 'lisp/net/tls.el' --- lisp/net/tls.el 2010-10-01 00:25:50 +0000 +++ lisp/net/tls.el 2010-10-01 12:56:44 +0000 @@ -76,12 +76,11 @@ :group 'tls) (defvar tls-starttls-switches - '(("gnutls-cli" "-s") - ("openssl" "-starttls imap")) + '(("openssl" "-starttls imap")) "Alist of programs and the switches necessary to get starttls behaviour.") -(defcustom tls-program '("gnutls-cli %s -p %p %h" - "gnutls-cli %s -p %p %h --protocols ssl3" +(defcustom tls-program '("gnutls-cli --insecure -p %p %h" + "gnutls-cli --insecure -p %p %h --protocols ssl3" "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof") "List of strings containing commands to start TLS stream to a host. Each entry in the list is tried until a connection is successful. ------------------------------------------------------------ revno: 101706 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-10-01 05:25:21 -0700 message: Use intern_c_string instead of intern. * src/nsselect.m (syms_of_nsselect): * src/nsmenu.m (syms_of_nsmenu): * src/nsfns.m (syms_of_nsfns): * src/msdos.c (syms_of_msdos): * src/image.c (syms_of_image): * src/charset.c (syms_of_charset): Use intern_c_string instead of intern. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 12:19:52 +0000 +++ src/ChangeLog 2010-10-01 12:25:21 +0000 @@ -1,5 +1,12 @@ 2010-10-01 Dan Nicolaescu + * nsselect.m (syms_of_nsselect): + * nsmenu.m (syms_of_nsmenu): + * nsfns.m (syms_of_nsfns): + * msdos.c (syms_of_msdos): + * image.c (syms_of_image): + * charset.c (syms_of_charset): Use intern_c_string instead of intern. + * point.h: Remove, unused. 2010-10-01 Eli Zaretskii === modified file 'src/charset.c' --- src/charset.c 2010-09-14 20:32:35 +0000 +++ src/charset.c 2010-10-01 12:25:21 +0000 @@ -2365,8 +2365,8 @@ Vemacs_mule_charset_list = Qnil; /* Don't staticpro them here. It's done in syms_of_fns. */ - QCtest = intern (":test"); - Qeq = intern ("eq"); + QCtest = intern_c_string (":test"); + Qeq = intern_c_string ("eq"); staticpro (&Vcharset_hash_table); { === modified file 'src/image.c' --- src/image.c 2010-09-25 12:04:35 +0000 +++ src/image.c 2010-10-01 12:25:21 +0000 @@ -8718,11 +8718,11 @@ staticpro (&QCheuristic_mask); QCindex = intern_c_string (":index"); staticpro (&QCindex); - QCgeometry = intern (":geometry"); + QCgeometry = intern_c_string (":geometry"); staticpro (&QCgeometry); - QCcrop = intern (":crop"); + QCcrop = intern_c_string (":crop"); staticpro (&QCcrop); - QCrotation = intern (":rotation"); + QCrotation = intern_c_string (":rotation"); staticpro (&QCrotation); QCmatrix = intern_c_string (":matrix"); staticpro (&QCmatrix); @@ -8785,7 +8785,7 @@ #endif #if defined (HAVE_IMAGEMAGICK) - Qimagemagick = intern ("imagemagick"); + Qimagemagick = intern_c_string ("imagemagick"); staticpro (&Qimagemagick); ADD_IMAGE_TYPE (Qimagemagick); #endif === modified file 'src/msdos.c' --- src/msdos.c 2010-08-13 09:21:31 +0000 +++ src/msdos.c 2010-10-01 12:25:21 +0000 @@ -4706,7 +4706,7 @@ #ifndef HAVE_X_WINDOWS /* The following two are from xfns.c: */ - Qreverse = intern ("reverse"); + Qreverse = intern_c_string ("reverse"); staticpro (&Qreverse); DEFVAR_LISP ("dos-unsupported-char-glyph", &Vdos_unsupported_char_glyph, === modified file 'src/nsfns.m' --- src/nsfns.m 2010-08-17 21:05:26 +0000 +++ src/nsfns.m 2010-10-01 12:25:21 +0000 @@ -2598,7 +2598,7 @@ { int i; - Qfontsize = intern ("fontsize"); + Qfontsize = intern_c_string ("fontsize"); staticpro (&Qfontsize); DEFVAR_LISP ("ns-icon-type-alist", &Vns_icon_type_alist, === modified file 'src/nsmenu.m' --- src/nsmenu.m 2010-08-11 12:34:46 +0000 +++ src/nsmenu.m 2010-10-01 12:25:21 +0000 @@ -1808,7 +1808,7 @@ defsubr (&Sns_reset_menu); defsubr (&Smenu_or_popup_active_p); - Qdebug_on_next_call = intern ("debug-on-next-call"); + Qdebug_on_next_call = intern_c_string ("debug-on-next-call"); staticpro (&Qdebug_on_next_call); } === modified file 'src/nsselect.m' --- src/nsselect.m 2010-08-19 05:55:30 +0000 +++ src/nsselect.m 2010-10-01 12:25:21 +0000 @@ -549,10 +549,10 @@ void syms_of_nsselect (void) { - QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD); - QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY); - QTEXT = intern ("TEXT"); staticpro (&QTEXT); - QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME); + QCLIPBOARD = intern_c_string ("CLIPBOARD"); staticpro (&QCLIPBOARD); + QSECONDARY = intern_c_string ("SECONDARY"); staticpro (&QSECONDARY); + QTEXT = intern_c_string ("TEXT"); staticpro (&QTEXT); + QFILE_NAME = intern_c_string ("FILE_NAME"); staticpro (&QFILE_NAME); defsubr (&Sx_disown_selection_internal); defsubr (&Sx_get_selection_internal); @@ -605,7 +605,7 @@ \(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD')."); Vns_lost_selection_hooks = Qnil; - Qforeign_selection = intern ("foreign-selection"); + Qforeign_selection = intern_c_string ("foreign-selection"); staticpro (&Qforeign_selection); } ------------------------------------------------------------ revno: 101705 committer: Dan Nicolaescu branch nick: trunk timestamp: Fri 2010-10-01 05:19:52 -0700 message: * src/point.h: Remove, unused. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-01 11:45:16 +0000 +++ src/ChangeLog 2010-10-01 12:19:52 +0000 @@ -1,3 +1,7 @@ +2010-10-01 Dan Nicolaescu + + * point.h: Remove, unused. + 2010-10-01 Eli Zaretskii * makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags) === removed file 'src/point.h' --- src/point.h 2010-01-04 05:35:18 +0000 +++ src/point.h 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -#define point_width 5 -#define point_height 19 -static char point_bits[] = { - 0x1f, 0x0e, 0x0e, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x04, 0x0e, 0x0e, 0x1f}; - -/* arch-tag: a8dad510-7254-4964-b71e-bb6f81cce572 - (do not change this comment) */ ------------------------------------------------------------ revno: 101704 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-10-01 13:52:23 +0200 message: nt/ChangeLog: Fix last entry. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-10-01 11:45:16 +0000 +++ nt/ChangeLog 2010-10-01 11:52:23 +0000 @@ -1,6 +1,7 @@ 2010-10-01 Eli Zaretskii * makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets. + emacs-src.tags: New file. * gmake.defs: Add a comment with a single quote to fix fontification. (Bug#7102) ------------------------------------------------------------ revno: 101703 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-10-01 13:45:16 +0200 message: Support TAGS targets in the w32 build. nt/makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets. emacs-src.tags: New file. src/makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags) (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake) (nt-TAGS-gmake, nt-TAGS-nmake): New targets. lisp/makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake) (TAGS-LISP-nmake, TAGS-gmake, TAGS-LISP-gmake, TAGS-SH) (TAGS-LISP-SH, TAGS-CMD, TAGS-LISP-CMD): New targets. lib-src/makefile.w32-in (tags, TAGS): New targets. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-09-30 02:53:26 +0000 +++ lib-src/ChangeLog 2010-10-01 11:45:16 +0000 @@ -1,3 +1,7 @@ +2010-10-01 Eli Zaretskii + + * makefile.w32-in (tags, TAGS): New targets. + 2010-09-30 Juanma Barranquero * emacsclient.c (get_server_config): Don't read Emacs pid from === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2010-09-29 15:07:34 +0000 +++ lib-src/makefile.w32-in 2010-10-01 11:45:16 +0000 @@ -378,6 +378,12 @@ getopt.h: getopt_.h $(CP) $(ALL_DEPS) $@ +### TAGS ### + +tags: TAGS +TAGS: $(BLD)/etags.exe *.c *.h + $(BLD)/etags.exe *.c *.h + ### DEPENDENCIES ### EMACS_ROOT = .. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-01 07:24:35 +0000 +++ lisp/ChangeLog 2010-10-01 11:45:16 +0000 @@ -1,3 +1,9 @@ +2010-10-01 Eli Zaretskii + + * makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake) + (TAGS-LISP-nmake, TAGS-gmake, TAGS-LISP-gmake, TAGS-SH) + (TAGS-LISP-SH, TAGS-CMD, TAGS-LISP-CMD): New targets. + 2010-10-01 Glenn Morris * obsolete/sc.el: Remove file. === modified file 'lisp/makefile.w32-in' --- lisp/makefile.w32-in 2010-09-13 16:33:56 +0000 +++ lisp/makefile.w32-in 2010-10-01 11:45:16 +0000 @@ -50,7 +50,11 @@ lisptagsfiles1 = $(lisp)/*.el lisptagsfiles2 = $(lisp)/*/*.el -ETAGS = "../lib-src/$(BLD)/etags" +lisptagsfiles3 = $(lisp)/*/*/*.el +lisptagsfiles4 = $(lisp)/*/*/*/*.el +ETAGS = "../lib-src/$(BLD)/etags.exe" +## $(DEST) is overridden by ../src/makefile.w32-in. +DEST=$(lisp) # Automatically generated autoload files, apart from lisp/loaddefs.el. LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ @@ -244,11 +248,42 @@ update-authors: $(emacs) -l authors -f batch-update-authors $(srcdir)/etc/AUTHORS $(srcdir) -TAGS: $(lisptagsfiles1) $(lisptagsfiles2) - $(ETAGS) $(lisptagsfiles1) $(lisptagsfiles2) - -TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) - $(ETAGS) -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2) +TAGS: TAGS-$(MAKETYPE) + +TAGS-LISP: TAGS-LISP-$(MAKETYPE) + +TAGS-nmake: + echo This target is not supported with NMake + exit -1 + +TAGS-LISP-nmake: + echo This target is not supported with NMake + exit -1 + +TAGS-gmake: TAGS-$(SHELLTYPE) + +TAGS-LISP-gmake: TAGS-LISP-$(SHELLTYPE) + +TAGS-SH: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) + - $(DEL) TAGS + for dir in . $(WINS_UPDATES); do \ + $(ETAGS) -a $(lisp)/$$dir/*.el; \ + done + +TAGS-LISP-SH: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) + - $(DEL) $(DEST)/TAGS-LISP + for dir in . $(WINS_UPDATES); do \ + $(ETAGS) -a -o $(DEST)/TAGS-LISP $(lisp)/$$dir/*.el; \ + done + +TAGS-CMD: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) + - $(DEL) TAGS + for %%d in (. $(WINS_UPDATES)) do $(ETAGS) -a $(lisp)/%%d/*.el + +TAGS-LISP-CMD: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) + - $(DEL) $(DEST)/TAGS-LISP + for %%d in (. $(WINS_UPDATES)) do \ + $(ETAGS) -a -o $(DEST)/TAGS-LISP $(lisp)/%%d/*.el .SUFFIXES: .elc .el === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-10-01 08:16:39 +0000 +++ nt/ChangeLog 2010-10-01 11:45:16 +0000 @@ -1,5 +1,7 @@ 2010-10-01 Eli Zaretskii + * makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets. + * gmake.defs: Add a comment with a single quote to fix fontification. (Bug#7102) === added file 'nt/emacs-src.tags' --- nt/emacs-src.tags 1970-01-01 00:00:00 +0000 +++ nt/emacs-src.tags 2010-10-01 11:45:16 +0000 @@ -0,0 +1,6 @@ + This file defines the regular expressions for etags to look for + in the src directory. It is used by the w32 build to work around + the annoyances of quoting command-line arguments with various + w32 shell. + +/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/ === modified file 'nt/makefile.w32-in' --- nt/makefile.w32-in 2010-07-25 03:07:15 +0000 +++ nt/makefile.w32-in 2010-10-01 11:45:16 +0000 @@ -417,3 +417,16 @@ realclean: cleanall - $(DEL_TREE) ../bin + +TAGS: TAGS-$(MAKETYPE) + +frc: +TAGS-gmake: frc + ../lib-src/$(BLD)/etags $(CURDIR)/*.c + $(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP + $(MAKE) $(MFLAGS) -C ../lib-src TAGS + +TAGS-nmake: + echo This target is not supported with NMake + +.PHONY: frc === modified file 'src/ChangeLog' --- src/ChangeLog 2010-09-30 23:26:40 +0000 +++ src/ChangeLog 2010-10-01 11:45:16 +0000 @@ -1,3 +1,9 @@ +2010-10-01 Eli Zaretskii + + * makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags) + (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake) + (nt-TAGS-gmake, nt-TAGS-nmake): New targets. + 2010-09-30 Dan Nicolaescu * xml.c (parse_string): Use const. === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2010-09-21 12:49:59 +0000 +++ src/makefile.w32-in 2010-10-01 11:45:16 +0000 @@ -293,6 +293,51 @@ - $(DEL_TREE) oo - $(DEL_TREE) oo-spd +## Arrange to make a tags table TAGS-LISP for ../lisp, +## plus TAGS for the C files, which includes ../lisp/TAGS by reference. +## +## This works only with GNU Make. + +TAGS: $(OBJ0) $(OBJ1) $(WIN32OBJ) + $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE) + +TAGS-LISP: $(OBJ0) $(OBJ1) $(WIN32OBJ) + $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE) + +TAGS-gmake: + ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \ + --regex=@../nt/emacs-src.tags \ + $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0)) + ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ + $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1)) + ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ + $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(WIN32OBJ)) $(CURDIR)/*.h + +TAGS-nmake: + echo This target is not supported with NMake + exit -1 + +frc: +TAGS-LISP-gmake: frc + $(MAKE) $(MFLAGS) -C ../lisp TAGS-LISP DEST=../src + +TAGS-LISP-nmake: + echo This target is not supported with NMake + exit -1 + +../nt/TAGS: frc + $(MAKE) $(MFLAGS) nt-TAGS-$(MAKETYPE) + +nt-TAGS-gmake: + $(MAKE) $(MFLAGS) -C ../nt TAGS + +nt-TAGS-nmake: + echo This target is not supported with NMake + exit -1 + +tags: TAGS TAGS-LISP ../nt/TAGS +.PHONY: tags + ### DEPENDENCIES ### EMACS_ROOT = .. ------------------------------------------------------------ revno: 101702 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-01 11:15:10 +0000 message: Florian Ragwitz' stuff removed because of missing paperwork. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-01 06:56:38 +0000 +++ lisp/gnus/ChangeLog 2010-10-01 11:15:10 +0000 @@ -1,12 +1,5 @@ 2010-10-01 Katsumi Yamaoka - * gnus-util.el (gnus-completing-read-function): Exclude - gnus-icompleting-read and gnus-ido-completing-read from candidates for - XEmacs since iswitchb.el is very old and ido.el is unavailable in - XEmacs. - (iswitchb-mode, iswitchb-temp-buflist, iswitchb-read-buffer): Silence - the byte compiler. - * gravatar.el: Don't load image.el that XEmacs doesn't provide. (gravatar-create-image): New function that's an alias to gnus-xmas-create-image, gnus-create-image, or create-image. @@ -143,17 +136,6 @@ `gnus-faces-properties-alist'. Add :version property. -2010-09-28 Florian Ragwitz - - * gnus-util.el (gnus-use-ido): Removed. - (gnus-std-completing-read): Add wrapper around completing-read. - (gnus-icompleting-read): Add wrapper around ibuffer-read-buffer. - (gnus-ido-completing-read): Add wrapper around ido-completing-read. - (gnus-completing-read-function): Add to chose from the above completion - functions or to provide a custom one. - (gnus-completing-read): Use the completing-read function configured - with gnus-completing-read-function. - 2010-09-28 Katsumi Yamaoka * mail-source.el (mail-source-report-new-mail) @@ -317,11 +299,6 @@ discover we're on a STARTTLS-capable server, then open a STARTTLS connection instead. -2010-09-27 Florian Ragwitz (tiny change) - - * sieve-manage.el (sieve-manage-default-stream): Make default stream - customizable. - 2010-09-27 Lars Magne Ingebrigtsen * nnimap.el (utf7): Required. @@ -342,11 +319,6 @@ * gnus-art.el (gnus-mime-delete-part): Fix Lisp type of byte(s). -2010-09-26 Florian Ragwitz (tiny change) - - * gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid - handing broken links to browse-url. - 2010-09-26 Lars Magne Ingebrigtsen * nndoc.el (nndoc-request-list): Return success always. === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-09-27 12:22:22 +0000 +++ lisp/gnus/gnus-html.el 2010-10-01 11:15:10 +0000 @@ -286,7 +286,7 @@ (setq url (match-string 1 parameters)) (gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url) (gnus-article-add-button start end - 'browse-url (mm-url-decode-entities-string url) + 'browse-url url url) (let ((overlay (gnus-make-overlay start end))) (gnus-overlay-put overlay 'evaporate t) === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-10-01 06:56:38 +0000 +++ lisp/gnus/gnus-util.el 2010-10-01 11:15:10 +0000 @@ -44,21 +44,11 @@ (defmacro with-no-warnings (&rest body) `(progn ,@body)))) -(defcustom gnus-completing-read-function - #'gnus-std-completing-read - "Function to do a completing read." +(defcustom gnus-use-ido nil + "Whether to use `ido' for `completing-read'." + :version "24.1" :group 'gnus-meta - :type `(radio (function-item - :doc "Use Emacs' standard `completing-read' function." - gnus-std-completing-read) - ,@(unless (featurep 'xemacs) - '((function-item - :doc "Use iswitchb's completing-read function." - gnus-icompleting-read) - (function-item - :doc "Use ido's completing-read function." - gnus-ido-completing-read))) - (function))) + :type 'boolean) (defcustom gnus-completion-styles (if (and (boundp 'completion-styles-alist) @@ -1593,55 +1583,19 @@ `(,(car spec) ,@(mapcar 'gnus-make-predicate-1 (cdr spec))) (error "Invalid predicate specifier: %s" spec))))) -(defun gnus-std-completing-read (prompt collection &optional require-match - initial-input history def) - (completing-read prompt collection nil require-match - initial-input history def)) - -(defvar iswitchb-mode) -(defvar iswitchb-temp-buflist) -(declare-function iswitchb-read-buffer "iswitchb" - (prompt &optional default require-match start matches-set)) - -(defun gnus-icompleting-read (prompt collection &optional require-match - initial-input history def) - (require 'iswitchb) - (let ((iswitchb-make-buflist-hook - (lambda () - (setq iswitchb-temp-buflist - (let ((choices (append (list) - (when initial-input (list initial-input)) - (symbol-value history) collection)) - filtered-choices) - (while choices - (when (and (car choices) (not (member (car choices) filtered-choices))) - (setq filtered-choices (cons (car choices) filtered-choices))) - (setq choices (cdr choices))) - (nreverse filtered-choices)))))) - (unwind-protect - (progn - (when (not iswitchb-mode) - (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)) - (iswitchb-read-buffer prompt def require-match)) - (when (not iswitchb-mode) - (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup))))) - -(defun gnus-ido-completing-read (prompt collection &optional require-match - initial-input history def) - (require 'ido) - (ido-completing-read prompt collection nil require-match - initial-input history def)) - (defun gnus-completing-read (prompt collection &optional require-match initial-input history def) - "Do a completing read with the configured `gnus-completing-read-function'." + "Call `completing-read' or `ido-completing-read'. +Depends on `gnus-use-ido'." (let ((completion-styles gnus-completion-styles)) (funcall - gnus-completing-read-function + (if gnus-use-ido + 'ido-completing-read + 'completing-read) (concat prompt (when def (concat " (default " def ")")) ": ") - collection require-match initial-input history def))) + collection nil require-match initial-input history def))) (defun gnus-graphic-display-p () (if (featurep 'xemacs) === modified file 'lisp/gnus/sieve-manage.el' --- lisp/gnus/sieve-manage.el 2010-09-27 23:07:47 +0000 +++ lisp/gnus/sieve-manage.el 2010-10-01 11:15:10 +0000 @@ -162,12 +162,6 @@ :type 'integer :group 'sieve-manage) -(defcustom sieve-manage-default-stream 'network - "Default stream type to use for `sieve-manage'. -Must be a name of a stream in `sieve-manage-stream-alist'." - :type 'symbol - :group 'sieve-manage) - ;; Internal variables: (defconst sieve-manage-local-variables '(sieve-manage-server @@ -180,6 +174,7 @@ sieve-manage-client-eol sieve-manage-server-eol sieve-manage-capability)) +(defconst sieve-manage-default-stream 'network) (defconst sieve-manage-coding-system-for-read 'binary) (defconst sieve-manage-coding-system-for-write 'binary) (defvar sieve-manage-stream nil) ------------------------------------------------------------ revno: 101701 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-10-01 10:16:39 +0200 message: Fix bug #7102. gmake.defs: Add a comment with a single quote to fix fontification. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2010-09-29 13:58:11 +0000 +++ nt/ChangeLog 2010-10-01 08:16:39 +0000 @@ -1,3 +1,8 @@ +2010-10-01 Eli Zaretskii + + * gmake.defs: Add a comment with a single quote to fix + fontification. (Bug#7102) + 2010-09-29 Eli Zaretskii * configure.bat: Fix the condition for copying paths.h into === modified file 'nt/gmake.defs' --- nt/gmake.defs 2010-07-20 18:01:17 +0000 +++ nt/gmake.defs 2010-10-01 08:16:39 +0000 @@ -96,6 +96,7 @@ ifdef USING_SH sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) sh_output := $(shell echo foo") +# This single quote " is to fix fintification due to previous line ifeq "$(sh_output)" "" NEW_CYGWIN = 1 endif ------------------------------------------------------------ revno: 101700 committer: Glenn Morris branch nick: trunk timestamp: Fri 2010-10-01 00:24:35 -0700 message: * lisp/obsolete/sc.el: Remove file. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-01 03:57:26 +0000 +++ lisp/ChangeLog 2010-10-01 07:24:35 +0000 @@ -1,5 +1,7 @@ 2010-10-01 Glenn Morris + * obsolete/sc.el: Remove file. + * files.el (temporary-file-directory): On darwin, also try DARWIN_USER_TEMP_DIR (see discussion in bug#7135). === removed file 'lisp/obsolete/sc.el' --- lisp/obsolete/sc.el 2010-01-04 05:35:18 +0000 +++ lisp/obsolete/sc.el 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ -;;; sc.el --- old name for supercite - -;; Maintainer: FSF - -;; This file is part of GNU Emacs. - -;;; Commentary: - -;; This file has been obsolete since Emacs 21.1. - -;;; Code: - -(require 'supercite) -(provide 'sc) - -(message "The name `sc' works but is obsolete; please use `supercite' instead") - -;; arch-tag: 31e8ae19-689e-4b7d-9161-6d7dd60c6ece -;;; sc.el ends here ------------------------------------------------------------ revno: 101699 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-10-01 06:56:38 +0000 message: gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read and gnus-ido-completing-read from candidates for XEmacs. Silence the byte compiler. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-01 05:50:11 +0000 +++ lisp/gnus/ChangeLog 2010-10-01 06:56:38 +0000 @@ -1,5 +1,12 @@ 2010-10-01 Katsumi Yamaoka + * gnus-util.el (gnus-completing-read-function): Exclude + gnus-icompleting-read and gnus-ido-completing-read from candidates for + XEmacs since iswitchb.el is very old and ido.el is unavailable in + XEmacs. + (iswitchb-mode, iswitchb-temp-buflist, iswitchb-read-buffer): Silence + the byte compiler. + * gravatar.el: Don't load image.el that XEmacs doesn't provide. (gravatar-create-image): New function that's an alias to gnus-xmas-create-image, gnus-create-image, or create-image. === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/gnus-util.el 2010-10-01 06:56:38 +0000 @@ -48,13 +48,16 @@ #'gnus-std-completing-read "Function to do a completing read." :group 'gnus-meta - :type '(radio (function-item + :type `(radio (function-item :doc "Use Emacs' standard `completing-read' function." gnus-std-completing-read) - (function-item :doc "Use iswitchb's completing-read function." - gnus-icompleting-read) - (function-item :doc "Use ido's completing-read function." - gnus-ido-completing-read) + ,@(unless (featurep 'xemacs) + '((function-item + :doc "Use iswitchb's completing-read function." + gnus-icompleting-read) + (function-item + :doc "Use ido's completing-read function." + gnus-ido-completing-read))) (function))) (defcustom gnus-completion-styles @@ -1595,6 +1598,11 @@ (completing-read prompt collection nil require-match initial-input history def)) +(defvar iswitchb-mode) +(defvar iswitchb-temp-buflist) +(declare-function iswitchb-read-buffer "iswitchb" + (prompt &optional default require-match start matches-set)) + (defun gnus-icompleting-read (prompt collection &optional require-match initial-input history def) (require 'iswitchb)