Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101753. ------------------------------------------------------------ revno: 101753 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-10-03 00:31:59 -0400 message: Remove obsolete use of binary-overwrite-mode in bytecomp (Bug#7001). * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Remove obsolete use of binary-overwrite-mode (Bug#7001). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 02:32:03 +0000 +++ lisp/ChangeLog 2010-10-03 04:31:59 +0000 @@ -1,3 +1,8 @@ +2010-10-03 Chong Yidong + + * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Remove + obsolete use of binary-overwrite-mode (Bug#7001). + 2010-10-03 Glenn Morris * obsolete/x-menu.el: Remove file, obsolete since 21.1 === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-10-02 23:10:41 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-10-03 04:31:59 +0000 @@ -1800,15 +1800,7 @@ (set-buffer-multibyte t) (erase-buffer) ;; (emacs-lisp-mode) - (setq case-fold-search nil) - ;; This is a kludge. Some operating systems (OS/2, DOS) need - ;; to write files containing binary information specially. - ;; Under most circumstances, such files will be in binary - ;; overwrite mode, so those OS's use that flag to guess how - ;; they should write their data. Advise them that .elc files - ;; need to be written carefully. (There's no point running the - ;; mode hook, so don't call `binary-overwrite-mode'.) - (setq overwrite-mode 'overwrite-mode-binary)) + (setq case-fold-search nil)) (displaying-byte-compile-warnings (with-current-buffer bytecomp-inbuffer (and bytecomp-filename ------------------------------------------------------------ revno: 101752 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2010-10-03 06:12:15 +0200 message: src/gnutls.c: Doc fixes. Make some functions static. (emacs_gnutls_handshake, gnutls_make_error, gnutls_emacs_global_init) (gnutls_emacs_global_deinit): Make static. (Fgnutls_get_initstage, Fgnutls_deinit, Fgnutls_boot, Fgnutls_bye): Fix typos in docstrings. (Fgnutls_error_fatalp, Fgnutls_error_string): Doc fixes. (Fgnutls_errorp): Doc fix; use ERR for the argument name. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-03 00:59:02 +0000 +++ src/ChangeLog 2010-10-03 04:12:15 +0000 @@ -1,3 +1,12 @@ +2010-10-03 Juanma Barranquero + + * gnutls.c (emacs_gnutls_handshake, gnutls_make_error) + (gnutls_emacs_global_init, gnutls_emacs_global_deinit): Make static. + (Fgnutls_get_initstage, Fgnutls_deinit, Fgnutls_boot, Fgnutls_bye): + Fix typos in docstrings. + (Fgnutls_error_fatalp, Fgnutls_error_string): Doc fixes. + (Fgnutls_errorp): Doc fix; use ERR for the argument name. + 2010-10-03 Chong Yidong * keyboard.c (command_loop_1): Make sure the mark is really alive === modified file 'src/gnutls.c' --- src/gnutls.c 2010-09-29 14:30:45 +0000 +++ src/gnutls.c 2010-10-03 04:12:15 +0000 @@ -32,7 +32,7 @@ Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake; int global_initialized; -void +static void emacs_gnutls_handshake (struct Lisp_Process *proc) { gnutls_session_t state = proc->gnutls_state; @@ -117,7 +117,8 @@ known symbol like `gnutls_e_interrupted' and `gnutls_e_again' or simply the integer value of the error. GNUTLS_E_SUCCESS is mapped to Qt. */ -Lisp_Object gnutls_make_error (int error) +static Lisp_Object +gnutls_make_error (int error) { switch (error) { @@ -135,9 +136,9 @@ } DEFUN ("gnutls-get-initstage", Fgnutls_get_initstage, Sgnutls_get_initstage, 1, 1, 0, - doc: /* Return the GnuTLS init stage of PROCESS. + doc: /* Return the GnuTLS init stage of process PROC. See also `gnutls-boot'. */) - (Lisp_Object proc) + (Lisp_Object proc) { CHECK_PROCESS (proc); @@ -145,19 +146,21 @@ } DEFUN ("gnutls-errorp", Fgnutls_errorp, Sgnutls_errorp, 1, 1, 0, - doc: /* Returns t if ERROR (as generated by gnutls_make_error) -indicates a GnuTLS problem. */) - (Lisp_Object error) + doc: /* Return t if ERROR indicates a GnuTLS problem. +ERROR is an integer or a symbol with an integer `gnutls-code' property. +usage: (gnutls-errorp ERROR) */) + (Lisp_Object err) { - if (EQ (error, Qt)) return Qnil; + if (EQ (err, Qt)) return Qnil; return Qt; } DEFUN ("gnutls-error-fatalp", Fgnutls_error_fatalp, Sgnutls_error_fatalp, 1, 1, 0, - doc: /* Checks if ERROR is fatal. -ERROR is an integer or a symbol with an integer `gnutls-code' property. */) - (Lisp_Object err) + doc: /* Check if ERROR is fatal. +ERROR is an integer or a symbol with an integer `gnutls-code' property. +usage: (gnutls-error-fatalp ERROR) */) + (Lisp_Object err) { Lisp_Object code; @@ -186,9 +189,10 @@ } DEFUN ("gnutls-error-string", Fgnutls_error_string, Sgnutls_error_string, 1, 1, 0, - doc: /* Returns a description of ERROR. -ERROR is an integer or a symbol with an integer `gnutls-code' property. */) - (Lisp_Object err) + doc: /* Return a description of ERROR. +ERROR is an integer or a symbol with an integer `gnutls-code' property. +usage: (gnutls-error-string ERROR) */) + (Lisp_Object err) { Lisp_Object code; @@ -214,9 +218,9 @@ } DEFUN ("gnutls-deinit", Fgnutls_deinit, Sgnutls_deinit, 1, 1, 0, - doc: /* Deallocate GNU TLS resources associated with PROCESS. + doc: /* Deallocate GNU TLS resources associated with process PROC. See also `gnutls-init'. */) - (Lisp_Object proc) + (Lisp_Object proc) { gnutls_session_t state; @@ -235,7 +239,8 @@ /* Initializes global GNU TLS state to defaults. Call `gnutls-global-deinit' when GNU TLS usage is no longer needed. Returns zero on success. */ -Lisp_Object gnutls_emacs_global_init (void) +static Lisp_Object +gnutls_emacs_global_init (void) { int ret = GNUTLS_E_SUCCESS; @@ -249,7 +254,8 @@ /* Deinitializes global GNU TLS state. See also `gnutls-global-init'. */ -Lisp_Object gnutls_emacs_global_deinit (void) +static Lisp_Object +gnutls_emacs_global_deinit (void) { if (global_initialized) gnutls_global_deinit (); @@ -259,17 +265,18 @@ return gnutls_make_error (GNUTLS_E_SUCCESS); } -static void gnutls_log_function (int level, const char* string) +static void +gnutls_log_function (int level, const char* string) { - message("gnutls.c: [%d] %s", level, string); + message ("gnutls.c: [%d] %s", level, string); } DEFUN ("gnutls-boot", Fgnutls_boot, Sgnutls_boot, 3, 7, 0, - doc: /* Initializes client-mode GnuTLS for process PROC. + doc: /* Initialize client-mode GnuTLS for process PROC. Currently only client mode is supported. Returns a success/failure value you can check with `gnutls-errorp'. -PRIORITY_STRING is a string describing the priority. +PRIORITY-STRING is a string describing the priority. TYPE is either `gnutls-anon' or `gnutls-x509pki'. TRUSTFILE is a PEM encoded trust file for `gnutls-x509pki'. KEYFILE is ... for `gnutls-x509pki' (TODO). @@ -283,16 +290,16 @@ the protocols's priority except for disabling protocols that were not specified. -Processes must be initialized with this function before other GNU TLS +Processes must be initialized with this function before other GnuTLS functions are used. This function allocates resources which can only be deallocated by calling `gnutls-deinit' or by calling it again. Each authentication type may need additional information in order to work. For X.509 PKI (`gnutls-x509pki'), you need TRUSTFILE and KEYFILE and optionally CALLBACK. */) - (Lisp_Object proc, Lisp_Object priority_string, Lisp_Object type, - Lisp_Object trustfile, Lisp_Object keyfile, Lisp_Object callback, - Lisp_Object loglevel) + (Lisp_Object proc, Lisp_Object priority_string, Lisp_Object type, + Lisp_Object trustfile, Lisp_Object keyfile, Lisp_Object callback, + Lisp_Object loglevel) { int ret = GNUTLS_E_SUCCESS; @@ -427,9 +434,9 @@ GNUTLS_LOG (1, max_log_level, "setting the priority string"); - ret = gnutls_priority_set_direct(state, - (char*) SDATA (priority_string), - NULL); + ret = gnutls_priority_set_direct (state, + (char*) SDATA (priority_string), + NULL); if (ret < GNUTLS_E_SUCCESS) return gnutls_make_error (ret); @@ -466,11 +473,11 @@ DEFUN ("gnutls-bye", Fgnutls_bye, Sgnutls_bye, 2, 2, 0, - doc: /* Terminate current GNU TLS connection for PROCESS. + doc: /* Terminate current GnuTLS connection for process PROC. The connection should have been initiated using `gnutls-handshake'. If CONT is not nil the TLS connection gets terminated and further -receives and sends will be disallowed. If the return value is zero you +receives and sends will be disallowed. If the return value is zero you may continue using the connection. If CONT is nil, GnuTLS actually sends an alert containing a close request and waits for the peer to reply with the same message. In order to reuse the connection you ------------------------------------------------------------ revno: 101751 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:32:03 -0700 message: * lisp/obsolete/x-menu.el: Remove file, obsolete since 21.1 diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 02:26:35 +0000 +++ lisp/ChangeLog 2010-10-03 02:32:03 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * obsolete/x-menu.el: Remove file, obsolete since 21.1 + * textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code. === removed file 'lisp/obsolete/x-menu.el' --- lisp/obsolete/x-menu.el 2010-01-13 08:35:10 +0000 +++ lisp/obsolete/x-menu.el 1970-01-01 00:00:00 +0000 @@ -1,153 +0,0 @@ -;;; x-menu.el --- menu support for X - -;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see . - -;;; Commentary: - -;; This file has been obsolete since Emacs 21.1. - -;;; Code: - -(defvar x-process-mouse-hook) - -(defun x-menu-mode () - "Major mode for creating permanent menus for use with X. -These menus are implemented entirely in Lisp; popup menus, implemented -with x-popup-menu, are implemented using XMenu primitives." - (make-local-variable 'x-menu-items-per-line) - (make-local-variable 'x-menu-item-width) - (make-local-variable 'x-menu-items-alist) - (make-local-variable 'x-process-mouse-hook) - (make-local-variable 'x-menu-assoc-buffer) - (setq buffer-read-only t) - (setq truncate-lines t) - (setq x-process-mouse-hook 'x-menu-pick-entry) - (setq mode-line-buffer-identification '("MENU: %32b"))) - -(defvar x-menu-max-width 0) -(defvar x-menu-items-per-line 0) -(defvar x-menu-item-width 0) -(defvar x-menu-items-alist nil) -(defvar x-menu-assoc-buffer nil) - -(defvar x-menu-item-spacing 1 - "*Minimum horizontal spacing between objects in a permanent X menu.") - -(defun x-menu-create-menu (name) - "Create a permanent X menu. -Returns an item which should be used as a -menu object whenever referring to the menu." - (let ((old (current-buffer)) - (buf (get-buffer-create name))) - (set-buffer buf) - (x-menu-mode) - (setq x-menu-assoc-buffer old) - (set-buffer old) - buf)) - -(defun x-menu-change-associated-buffer (menu buffer) - "Change associated buffer of MENU to BUFFER. -BUFFER should be a buffer object." - (let ((old (current-buffer))) - (set-buffer menu) - (setq x-menu-assoc-buffer buffer) - (set-buffer old))) - -(defun x-menu-add-item (menu item binding) - "Add to MENU an item with name ITEM, associated with BINDING. -Following a sequence of calls to x-menu-add-item, a call to x-menu-compute -should be performed before the menu will be made available to the user. - -BINDING should be a function of one argument, which is the numerical -button/key code as defined in x-menu.el." - (let ((old (current-buffer)) - elt) - (set-buffer menu) - (if (setq elt (assoc item x-menu-items-alist)) - (rplacd elt binding) - (setq x-menu-items-alist (append x-menu-items-alist - (list (cons item binding))))) - (set-buffer old) - item)) - -(defun x-menu-delete-item (menu item) - "Delete from MENU the item named ITEM. -Call `x-menu-compute' before making the menu available to the user." - (let ((old (current-buffer)) - elt) - (set-buffer menu) - (if (setq elt (assoc item x-menu-items-alist)) - (rplaca elt nil)) - (set-buffer old) - item)) - -(defun x-menu-activate (menu) - "Compute all necessary parameters for MENU. -This must be called whenever a menu is modified before it is made -available to the user. This also creates the menu itself." - (let ((buf (current-buffer))) - (pop-to-buffer menu) - (let (buffer-read-only) - (setq x-menu-max-width (1- (frame-width))) - (setq x-menu-item-width 0) - (let (items-head - (items-tail x-menu-items-alist)) - (while items-tail - (if (car (car items-tail)) - (progn (setq items-head (cons (car items-tail) items-head)) - (setq x-menu-item-width - (max x-menu-item-width - (length (car (car items-tail))))))) - (setq items-tail (cdr items-tail))) - (setq x-menu-items-alist (reverse items-head))) - (setq x-menu-item-width (+ x-menu-item-spacing x-menu-item-width)) - (setq x-menu-items-per-line - (max 1 (/ x-menu-max-width x-menu-item-width))) - (erase-buffer) - (let ((items-head x-menu-items-alist)) - (while items-head - (let ((items 0)) - (while (and items-head - (<= (setq items (1+ items)) x-menu-items-per-line)) - (insert (format (concat "%" - (int-to-string x-menu-item-width) "s") - (car (car items-head)))) - (setq items-head (cdr items-head)))) - (insert ?\n))) - (shrink-window (max 0 - (- (window-height) - (1+ (count-lines (point-min) (point-max)))))) - (goto-char (point-min))) - (pop-to-buffer buf))) - -(defun x-menu-pick-entry (position event) - "Internal function for dispatching on mouse/menu events" - (let* ((x (min (1- x-menu-items-per-line) - (/ (current-column) x-menu-item-width))) - (y (- (count-lines (point-min) (point)) - (if (zerop (current-column)) 0 1))) - (item (+ x (* y x-menu-items-per-line))) - (litem (cdr (nth item x-menu-items-alist)))) - (and litem (funcall litem event))) - (pop-to-buffer x-menu-assoc-buffer)) - -(provide 'x-menu) - -;; arch-tag: 889f6d49-c01b-49e7-aaef-b0c6966c2961 -;;; x-menu.el ends here ------------------------------------------------------------ revno: 101750 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:26:35 -0700 message: * textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 02:22:40 +0000 +++ lisp/ChangeLog 2010-10-03 02:26:35 +0000 @@ -1,5 +1,8 @@ 2010-10-03 Glenn Morris + * textmodes/rst.el (rst-font-lock-keywords-function): + Drop Emacs 20 code. + * textmodes/artist.el (artist-replace-char): Drop Emacs 20 code. * printing.el: Drop Emacs 20 code. === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2010-05-25 02:11:08 +0000 +++ lisp/textmodes/rst.el 2010-10-03 02:26:35 +0000 @@ -2859,10 +2859,7 @@ ;; There seems to be a bug leading to error "Stack overflow in regexp ;; matcher" when "|" or "\\*" are the characters searched for - (re-imendbeg - (if (< emacs-major-version 21) - "]" - "\\]\\|\\\\.")) + (re-imendbeg "\\]\\|\\\\.") ;; inline markup content end (re-imend (concat re-imendbeg "\\)*[^\t \\\\]\\)")) ;; inline markup content without asterisk ------------------------------------------------------------ revno: 101749 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:22:40 -0700 message: * lisp/textmodes/artist.el (artist-replace-char): Drop Emacs 20 code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 02:17:47 +0000 +++ lisp/ChangeLog 2010-10-03 02:22:40 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * textmodes/artist.el (artist-replace-char): Drop Emacs 20 code. + * printing.el: Drop Emacs 20 code. * calendar/appt.el (appt-delete): Don't autoload it (you can't use it === modified file 'lisp/textmodes/artist.el' --- lisp/textmodes/artist.el 2010-09-19 09:49:21 +0000 +++ lisp/textmodes/artist.el 2010-10-03 02:22:40 +0000 @@ -1,7 +1,7 @@ ;;; artist.el --- draw ascii graphics with your mouse -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Tomas Abrahamsson ;; Maintainer: Tomas Abrahamsson @@ -1957,24 +1957,11 @@ (defun artist-replace-char (new-char) "Replace the character at point with NEW-CHAR." - ;; Check that the variable exists first. The doc says it was added in 19.23. - (if (and (and (boundp 'emacs-major-version) (= emacs-major-version 20)) - (and (boundp 'emacs-minor-version) (<= emacs-minor-version 3))) - ;; This is a bug workaround for Emacs 20, versions up to 20.3: - ;; The self-insert-command doesn't care about the overwrite-mode, - ;; so the insertion is done in the same way as in picture mode. - ;; This seems to be a little bit slower. - (progn - (artist-move-to-xy (1+ (artist-current-column)) - (artist-current-line)) - (delete-char -1) - (insert (artist-get-replacement-char new-char))) - ;; In emacs-19, the self-insert-command works better and faster - (let ((overwrite-mode 'overwrite-mode-textual) - (fill-column 32765) ; Large :-) - (blink-matching-paren nil)) - (setq last-command-event (artist-get-replacement-char new-char)) - (self-insert-command 1)))) + (let ((overwrite-mode 'overwrite-mode-textual) + (fill-column 32765) ; Large :-) + (blink-matching-paren nil)) + (setq last-command-event (artist-get-replacement-char new-char)) + (self-insert-command 1))) (defun artist-replace-chars (new-char count) "Replace characters at point with NEW-CHAR. COUNT chars are replaced." ------------------------------------------------------------ revno: 101748 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:17:47 -0700 message: * lisp/printing.el: Drop Emacs 20 code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 01:56:11 +0000 +++ lisp/ChangeLog 2010-10-03 02:17:47 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * printing.el: Drop Emacs 20 code. + * calendar/appt.el (appt-delete): Don't autoload it (you can't use it without having used appt.el already). === modified file 'lisp/printing.el' --- lisp/printing.el 2010-01-13 08:35:10 +0000 +++ lisp/printing.el 2010-10-03 02:17:47 +0000 @@ -1,7 +1,7 @@ ;;; printing.el --- printing utilities -;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre @@ -1387,20 +1387,6 @@ (require 'easymenu)) ; to avoid compilation gripes (eval-and-compile - (cond - ;; GNU Emacs 20 - ((< emacs-major-version 21) - (defun pr-global-menubar (pr-menu-spec) - (require 'easymenu) - (easy-menu-change '("tools") "Printing" pr-menu-spec pr-menu-print-item) - (when pr-menu-print-item - (easy-menu-remove-item nil '("tools") pr-menu-print-item) - (setq pr-menu-print-item nil - pr-menu-bar (vector 'menu-bar 'tools - (pr-get-symbol "Printing"))))) - ) - ;; GNU Emacs 21 & 22 - (t (defun pr-global-menubar (pr-menu-spec) (require 'easymenu) (let ((menu-file (if (= emacs-major-version 21) @@ -1422,8 +1408,7 @@ (t (easy-menu-add-item global-map menu-file (easy-menu-create-menu "Print" pr-menu-spec))) - ))) - ))) + )))) (eval-and-compile (cond ------------------------------------------------------------ revno: 101747 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:12:55 -0700 message: * lisp/gnus/nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-03 02:09:53 +0000 +++ lisp/gnus/ChangeLog 2010-10-03 02:12:55 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code. + * smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code. * gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft. === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/nnmairix.el 2010-10-03 02:12:55 +0000 @@ -1572,14 +1572,11 @@ (defun nnmairix-replace-illegal-chars (header) "Replace illegal characters in HEADER for mairix query." (when header - (if (> emacs-major-version 20) - (while (string-match "[^-.@/,& [:alnum:]]" header) - (setq header (replace-match "" t t header))) - (while (string-match "[[]{}:<>]" header) - (setq header (replace-match "" t t header)))) + (while (string-match "[^-.@/,& [:alnum:]]" header) + (setq header (replace-match "" t t header))) (while (string-match "[-& ]" header) (setq header (replace-match "," t t header))) - header)) + header)) (defun nnmairix-group-toggle-parameter (group parameter description &optional par) "Toggle on GROUP a certain PARAMETER. ------------------------------------------------------------ revno: 101746 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:09:53 -0700 message: * lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-03 02:07:11 +0000 +++ lisp/gnus/ChangeLog 2010-10-03 02:09:53 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code. + * gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft. * gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft. === modified file 'lisp/gnus/smime.el' --- lisp/gnus/smime.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/smime.el 2010-10-03 02:09:53 +0000 @@ -1,7 +1,7 @@ ;;; smime.el --- S/MIME support library -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: SMIME X.509 PEM OpenSSL @@ -591,9 +591,7 @@ "Get cetificate for MAIL from the ldap server at HOST." (let ((ldapresult (funcall - (if (or (featurep 'xemacs) - ;; For Emacs >= 22 we don't need smime-ldap.el - (< emacs-major-version 22)) + (if (featurep 'xemacs) (progn (require 'smime-ldap) 'smime-ldap-search) ------------------------------------------------------------ revno: 101745 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:07:11 -0700 message: * lisp/gnus/gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-03 02:01:07 +0000 +++ lisp/gnus/ChangeLog 2010-10-03 02:07:11 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft. + * gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft. * gnus-util.el (gnus-make-local-hook): Simplify. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-10-01 23:08:25 +0000 +++ lisp/gnus/gnus-art.el 2010-10-03 02:07:11 +0000 @@ -8171,9 +8171,6 @@ (defvar gnus-next-page-map (let ((map (make-sparse-keymap))) - (unless (>= emacs-major-version 21) - ;; XEmacs doesn't care. - (set-keymap-parent map gnus-article-mode-map)) (define-key map gnus-mouse-2 'gnus-button-next-page) (define-key map "\r" 'gnus-button-next-page) map)) ------------------------------------------------------------ revno: 101744 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:03:18 -0700 message: Tix fypo in previous change. diff: === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-10-03 01:53:04 +0000 +++ lisp/gnus/gnus-util.el 2010-10-03 02:03:18 +0000 @@ -151,7 +151,7 @@ ;; up the byte compiler. (defalias 'gnus-make-local-hook (if (featurep 'xemacs) 'make-local-hook - 'ignore) + 'ignore)) (defun gnus-delete-first (elt list) "Delete by side effect the first occurrence of ELT as a member of LIST." ------------------------------------------------------------ revno: 101743 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 19:01:07 -0700 message: * lisp/gnus/gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-03 01:53:04 +0000 +++ lisp/gnus/ChangeLog 2010-10-03 02:01:07 +0000 @@ -1,5 +1,7 @@ 2010-10-03 Glenn Morris + * gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft. + * gnus-util.el (gnus-make-local-hook): Simplify. 2010-10-02 Julien Danjou === modified file 'lisp/gnus/gmm-utils.el' --- lisp/gnus/gmm-utils.el 2010-09-24 07:25:37 +0000 +++ lisp/gnus/gmm-utils.el 2010-10-03 02:01:07 +0000 @@ -1,6 +1,7 @@ ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML -;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Reiner Steib ;; Keywords: news @@ -411,12 +412,9 @@ In XEmacs, the seventh argument of `write-region' specifies the coding-system." - (if (and mustbenew - (or (featurep 'xemacs) - (= emacs-major-version 20))) + (if (and mustbenew (featurep 'xemacs)) (if (file-exists-p filename) - (signal 'file-already-exists - (list "File exists" filename)) + (signal 'file-already-exists (list "File exists" filename)) (write-region start end filename append visit lockname)) (write-region start end filename append visit lockname mustbenew))) ------------------------------------------------------------ revno: 101742 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 18:56:11 -0700 message: Do not autoload appt-delete. * lisp/calendar/appt.el (appt-delete): Don't autoload it (you can't use it without having used appt.el already). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 01:53:04 +0000 +++ lisp/ChangeLog 2010-10-03 01:56:11 +0000 @@ -1,5 +1,8 @@ 2010-10-03 Glenn Morris + * calendar/appt.el (appt-delete): Don't autoload it (you can't use it + without having used appt.el already). + * subr.el (make-local-hook): Remove function obsolete since 21.1. * progmodes/cc-mode.el (make-local-hook): Don't do cc-bytecomp stuff. (c-basic-common-init, c-font-lock-init): Only call make-local-hook on === modified file 'lisp/calendar/appt.el' --- lisp/calendar/appt.el 2010-09-30 02:15:17 +0000 +++ lisp/calendar/appt.el 2010-10-03 01:56:11 +0000 @@ -456,7 +456,6 @@ (setq appt-time-msg-list (appt-sort-list (nconc appt-time-msg-list (list time-msg))))))) -;;;###autoload (defun appt-delete () "Delete an appointment from the list of appointments." (interactive) ------------------------------------------------------------ revno: 101741 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 18:53:04 -0700 message: * lisp/subr.el (make-local-hook): Remove function obsolete since 21.1. * lisp/progmodes/cc-mode.el (make-local-hook): Don't do cc-bytecomp stuff. (c-basic-common-init, c-font-lock-init): Only call make-local-hook on XEmacs. * lisp/progmodes/cc-styles.el (make-local-hook): Don't do cc-bytecomp stuff. (c-make-styles-buffer-local): Only call make-local-hook on XEmacs. * lisp/gnu/gnus-util.el (gnus-make-local-hook): Simplify. * etc/NEWS: Mention above change. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-10-03 00:03:44 +0000 +++ etc/NEWS 2010-10-03 01:53:04 +0000 @@ -551,7 +551,8 @@ 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 +iswitchb-default-keybindings, char-bytes, isearch-return-char, +make-local-hook ** The following variables and aliases, obsolete since at least Emacs 21.1, have been removed: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 01:35:07 +0000 +++ lisp/ChangeLog 2010-10-03 01:53:04 +0000 @@ -1,5 +1,12 @@ 2010-10-03 Glenn Morris + * subr.el (make-local-hook): Remove function obsolete since 21.1. + * progmodes/cc-mode.el (make-local-hook): Don't do cc-bytecomp stuff. + (c-basic-common-init, c-font-lock-init): Only call make-local-hook on + XEmacs. + * progmodes/cc-styles.el (make-local-hook): Don't do cc-bytecomp stuff. + (c-make-styles-buffer-local): Only call make-local-hook on XEmacs. + * ps-def.el (leading-code-private-22, charset-bytes, charset-id) (charset-width, find-charset-region, chars-in-region, forward-point) (encode-coding-string, coding-system-p, ccl-execute-on-string) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-03 00:33:27 +0000 +++ lisp/gnus/ChangeLog 2010-10-03 01:53:04 +0000 @@ -1,3 +1,7 @@ +2010-10-03 Glenn Morris + + * gnus-util.el (gnus-make-local-hook): Simplify. + 2010-10-02 Julien Danjou * gnus-util.el (gnus-iswitchb-completing-read): New function. === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-10-03 00:33:27 +0000 +++ lisp/gnus/gnus-util.el 2010-10-03 01:53:04 +0000 @@ -149,11 +149,9 @@ ;; XEmacs. In Emacs we don't need to call `make-local-hook' first. ;; It's harmless, though, so the main purpose of this alias is to shut ;; up the byte compiler. -(defalias 'gnus-make-local-hook - (if (eq (get 'make-local-hook 'byte-compile) - 'byte-compile-obsolete) - 'ignore ; Emacs - 'make-local-hook)) ; XEmacs +(defalias 'gnus-make-local-hook (if (featurep 'xemacs) + 'make-local-hook + 'ignore) (defun gnus-delete-first (elt list) "Delete by side effect the first occurrence of ELT as a member of LIST." === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2010-08-29 16:17:13 +0000 +++ lisp/progmodes/cc-mode.el 2010-10-03 01:53:04 +0000 @@ -100,7 +100,6 @@ (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs (cc-bytecomp-defun set-keymap-parents) ; XEmacs (cc-bytecomp-defun run-mode-hooks) ; Emacs 21.1 -(cc-bytecomp-obsolete-fun make-local-hook) ; Marked obsolete in Emacs 21.1. ;; We set these variables during mode init, yet we don't require ;; font-lock. @@ -600,9 +599,10 @@ ;; Install the functions that ensure that various internal caches ;; don't become invalid due to buffer changes. - (make-local-hook 'before-change-functions) + (when (featurep 'xemacs) + (make-local-hook 'before-change-functions) + (make-local-hook 'after-change-functions)) (add-hook 'before-change-functions 'c-before-change nil t) - (make-local-hook 'after-change-functions) (add-hook 'after-change-functions 'c-after-change nil t) (set (make-local-variable 'font-lock-extend-after-change-region-function) 'c-extend-after-change-region)) ; Currently (2009-05) used by all @@ -1113,8 +1113,8 @@ c-beginning-of-syntax (font-lock-mark-block-function . c-mark-function))) - - (make-local-hook 'font-lock-mode-hook) + (if (featurep 'xemacs) + (make-local-hook 'font-lock-mode-hook)) (add-hook 'font-lock-mode-hook 'c-after-font-lock-init nil t)) (defun c-extend-after-change-region (beg end old-len) === modified file 'lisp/progmodes/cc-styles.el' --- lisp/progmodes/cc-styles.el 2010-08-29 16:17:13 +0000 +++ lisp/progmodes/cc-styles.el 2010-10-03 01:53:04 +0000 @@ -50,7 +50,6 @@ ;; Silence the compiler. (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs -(cc-bytecomp-obsolete-fun make-local-hook) ; Marked obsolete in Emacs 21.1. (defvar c-style-alist @@ -649,7 +648,7 @@ (mapc func varsyms) ;; Hooks must be handled specially (if this-buf-only-p - (make-local-hook 'c-special-indent-hook) + (if (featurep 'xemacs) (make-local-hook 'c-special-indent-hook)) (with-no-warnings (make-variable-buffer-local 'c-special-indent-hook)) (setq c-style-variables-are-local-p t)) )) === modified file 'lisp/subr.el' --- lisp/subr.el 2010-10-03 01:11:20 +0000 +++ lisp/subr.el 2010-10-03 01:53:04 +0000 @@ -1163,37 +1163,6 @@ ;;;; Hook manipulation functions. -(defun make-local-hook (hook) - "Make the hook HOOK local to the current buffer. -The return value is HOOK. - -You never need to call this function now that `add-hook' does it for you -if its LOCAL argument is non-nil. - -When a hook is local, its local and global values -work in concert: running the hook actually runs all the hook -functions listed in *either* the local value *or* the global value -of the hook variable. - -This function works by making t a member of the buffer-local value, -which acts as a flag to run the hook functions in the default value as -well. This works for all normal hooks, but does not work for most -non-normal hooks yet. We will be changing the callers of non-normal -hooks so that they can handle localness; this has to be done one by -one. - -This function does nothing if HOOK is already local in the current -buffer. - -Do not use `make-local-variable' to make a hook variable buffer-local." - (if (local-variable-p hook) - nil - (or (boundp hook) (set hook nil)) - (make-local-variable hook) - (set hook (list t))) - hook) -(make-obsolete 'make-local-hook "not necessary any more." "21.1") - (defun add-hook (hook function &optional append local) "Add to the value of HOOK the function FUNCTION. FUNCTION is not added if already present. ------------------------------------------------------------ revno: 101740 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 18:35:07 -0700 message: Remove some unused ps-def definitions. * lisp/ps-def.el (leading-code-private-22, charset-bytes, charset-id) (charset-width, find-charset-region, chars-in-region, forward-point) (encode-coding-string, coding-system-p, ccl-execute-on-string) (define-ccl-program, multibyte-string-p, string-make-multibyte): Remove compatibility cruft (none of these are used by ps*.el). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 01:11:20 +0000 +++ lisp/ChangeLog 2010-10-03 01:35:07 +0000 @@ -1,3 +1,11 @@ +2010-10-03 Glenn Morris + + * ps-def.el (leading-code-private-22, charset-bytes, charset-id) + (charset-width, find-charset-region, chars-in-region, forward-point) + (encode-coding-string, coding-system-p, ccl-execute-on-string) + (define-ccl-program, multibyte-string-p, string-make-multibyte): + Remove compatibility cruft (none of these are used by ps*.el). + 2010-10-03 Kevin Rodgers * subr.el (booleanp): Return t instead of a list (Bug#7086). === modified file 'lisp/ps-def.el' --- lisp/ps-def.el 2010-10-02 02:46:13 +0000 +++ lisp/ps-def.el 2010-10-03 01:35:07 +0000 @@ -50,90 +50,25 @@ (cond ((featurep 'xemacs) ; XEmacs - ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ps-bdf (defvar installation-directory nil) (defvar coding-system-for-read) - ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ps-mule - (defvar leading-code-private-22 157) - - (or (fboundp 'charset-bytes) - (defun charset-bytes (charset) 1)) ; ascii - (or (fboundp 'charset-dimension) (defun charset-dimension (charset) 1)) ; ascii - (or (fboundp 'charset-id) - (defun charset-id (charset) 0)) ; ascii - - (or (fboundp 'charset-width) - (defun charset-width (charset) 1)) ; ascii - - (or (fboundp 'find-charset-region) - (defun find-charset-region (beg end &optional table) - (list 'ascii))) - (or (fboundp 'char-width) (defun char-width (char) 1)) ; ascii - (or (fboundp 'chars-in-region) - (defun chars-in-region (beg end) - (- (max beg end) (min beg end)))) - - (or (fboundp 'forward-point) - (defun forward-point (arg) - (save-excursion - (let ((count (abs arg)) - (step (if (zerop arg) - 0 - (/ arg arg)))) - (while (and (> count 0) - (< (point-min) (point)) (< (point) (point-max))) - (forward-char step) - (setq count (1- count))) - (+ (point) (* count step)))))) - - (or (fboundp 'encode-coding-string) - (defun encode-coding-string (string coding-system &optional nocopy) - (if nocopy - string - (copy-sequence string)))) - - (or (fboundp 'coding-system-p) - (defun coding-system-p (obj) nil)) - - (or (fboundp 'ccl-execute-on-string) - (defun ccl-execute-on-string (ccl-prog status str - &optional contin unibyte-p) - str)) - - (or (fboundp 'define-ccl-program) - (defmacro define-ccl-program (name ccl-program &optional doc) - `(defconst ,name nil ,doc))) - - (or (fboundp 'multibyte-string-p) - (defun multibyte-string-p (str) - (let ((len (length str)) - (i 0) - multibyte) - (while (and (< i len) (not (setq multibyte (> (aref str i) 255)))) - (setq i (1+ i))) - multibyte))) - - (or (fboundp 'string-make-multibyte) - (defalias 'string-make-multibyte 'copy-sequence)) - (or (fboundp 'encode-char) (defun encode-char (ch ccs) ch)) - ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ps-print ------------------------------------------------------------ revno: 101739 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-10-02 18:30:51 -0700 message: url-http.el comment. diff: === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2010-10-02 02:04:20 +0000 +++ lisp/url/url-http.el 2010-10-03 01:30:51 +0000 @@ -1,7 +1,7 @@ ;;; url-http.el --- HTTP retrieval routines -;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 2008, -;; 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Bill Perry ;; Keywords: comm, data, processes @@ -1267,6 +1267,7 @@ ;; the data ourselves. This is slightly less efficient, but there ;; were tons of weird ways the after-change code was biting us in the ;; shorts. +;; FIXME this can probably be simplified since the above is no longer true. (defun url-http-generic-filter (proc data) ;; Sometimes we get a zero-length data chunk after the process has ;; been changed to 'free', which means it has no buffer associated ------------------------------------------------------------ revno: 101738 author: Kevin Rodgers committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-10-02 21:11:20 -0400 message: * subr.el (booleanp): Return t instead of a list (Bug#7086). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-03 00:03:44 +0000 +++ lisp/ChangeLog 2010-10-03 01:11:20 +0000 @@ -1,3 +1,7 @@ +2010-10-03 Kevin Rodgers + + * subr.el (booleanp): Return t instead of a list (Bug#7086). + 2010-10-03 Chong Yidong * server.el (server-process-filter, server-return-error): Give === modified file 'lisp/subr.el' --- lisp/subr.el 2010-10-02 02:46:13 +0000 +++ lisp/subr.el 2010-10-03 01:11:20 +0000 @@ -2420,8 +2420,9 @@ (or (stringp object) (null object))) (defun booleanp (object) - "Return non-nil if OBJECT is one of the two canonical boolean values: t or nil." - (memq object '(nil t))) + "Return t if OBJECT is one of the two canonical boolean values: t or nil. +Otherwise, return nil." + (and (memq object '(nil t)) t)) (defun field-at-pos (pos) "Return the field at position POS, taking stickiness etc into account." ------------------------------------------------------------ revno: 101737 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-10-02 20:59:02 -0400 message: * keyboard.c (command_loop_1): Make sure the mark is really alive before using it (Bug#7044). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-02 12:12:17 +0000 +++ src/ChangeLog 2010-10-03 00:59:02 +0000 @@ -1,3 +1,8 @@ +2010-10-03 Chong Yidong + + * keyboard.c (command_loop_1): Make sure the mark is really alive + before using it (Bug#7044). + 2010-10-02 Juanma Barranquero * makefile.w32-in (tags): Rename target to full-tags. === modified file 'src/keyboard.c' --- src/keyboard.c 2010-09-26 16:20:01 +0000 +++ src/keyboard.c 2010-10-03 00:59:02 +0000 @@ -1786,7 +1786,8 @@ this_single_command_key_start = 0; } - if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks)) + if (!NILP (current_buffer->mark_active) + && !NILP (Vrun_hooks)) { /* In Emacs 22, setting transient-mark-mode to `only' was a way of turning it on for just one command. This usage is @@ -1805,6 +1806,9 @@ /* Even if not deactivating the mark, set PRIMARY if `select-active-regions' is non-nil. */ if (!NILP (Fwindow_system (Qnil)) + /* Even if mark_active is non-nil, the actual buffer + marker may not have been set yet (Bug#7044). */ + && XMARKER (current_buffer->mark)->buffer && (EQ (Vselect_active_regions, Qonly) ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly) : (!NILP (Vselect_active_regions) ------------------------------------------------------------ revno: 101736 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-10-03 00:33:27 +0000 message: Merge changes made in Gnus trunk. shr.el: Start implementation. shr.el: Continue implementation. gnus-gravatar.el (gnus-gravatar-insert): Adjust character where we should go backward. shr.el: Minimally useful state achieved. mm-decode.el (mm-text-html-renderer): Switch to using shr.el for HTML rendering. shr.el: (shr-insert): Add a newline after every picture before text. gnus.texi (Splitting Mail): Really fix the @ref syntax. shr.el (shr-add-font): Use overlays for combining faces. shr.el (shr-add-font): Use overlays for combining faces. shr.el (shr-insert): Pass upwards the text start point. gnus-util.el: Reintroduce multiple completion functions. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-02 14:07:02 +0000 +++ doc/misc/ChangeLog 2010-10-03 00:33:27 +0000 @@ -1,6 +1,7 @@ 2010-10-02 Lars Magne Ingebrigtsen * gnus.texi (Splitting Mail): Fix @xref syntax. + (Splitting Mail): Really fix the @ref syntax. 2010-10-01 Lars Magne Ingebrigtsen === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-10-02 14:07:02 +0000 +++ doc/misc/gnus.texi 2010-10-03 00:33:27 +0000 @@ -15111,7 +15111,7 @@ thinks should carry this mail message. This variable can also be a fancy split method. For the syntax, -@pxref{Fancy Mail Splitting}. +see @ref{Fancy Mail Splitting}. 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; === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-02 18:31:57 +0000 +++ lisp/gnus/ChangeLog 2010-10-03 00:33:27 +0000 @@ -1,3 +1,28 @@ +2010-10-02 Julien Danjou + + * gnus-util.el (gnus-iswitchb-completing-read): New function. + (gnus-ido-completing-read): New function. + (gnus-emacs-completing-read): New function. + (gnus-completing-read): Use gnus-completing-read-function. + Add gnus-completing-read-function. + +2010-10-02 Lars Magne Ingebrigtsen + + * shr.el (shr-insert-document): Autoload. + (shr-img): Be silent. + (shr-insert): Add a newline after every picture before text. + (shr-add-font): Use overlays for combining faces. + (shr-insert): Pass upwards the text start point. + + * mm-decode.el (mm-text-html-renderer): Default to shr.el rendering, if + possible. + (mm-shr): New function. + +2010-10-02 Julien Danjou + + * gnus-gravatar.el (gnus-gravatar-insert): Adjust character where we + should go backward. + 2010-10-02 Juanma Barranquero * shr.el (shr): Fix typo in provide call. === modified file 'lisp/gnus/gnus-gravatar.el' --- lisp/gnus/gnus-gravatar.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/gnus-gravatar.el 2010-10-03 00:33:27 +0000 @@ -76,7 +76,7 @@ (search-backward mail-address nil t))) (goto-char (1- (point))) ;; If we're on the " quoting the name, go backward - (when (looking-at "\"") + (when (looking-at "[\"<]") (goto-char (1- (point)))) ;; Do not do anything if there's already a gravatar. This can ;; happens if the buffer has been regenerated in the mean time, for === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-10-02 10:30:06 +0000 +++ lisp/gnus/gnus-html.el 2010-10-03 00:33:27 +0000 @@ -402,7 +402,8 @@ (defun gnus-html-put-image (data url &optional alt-text) (when (gnus-graphic-display-p) - (let* ((start (text-property-any (point-min) (point-max) 'gnus-image-url url)) + (let* ((start (text-property-any (point-min) (point-max) + 'gnus-image-url url)) (end (when start (next-single-property-change start 'gnus-image-url)))) ;; Image found? @@ -416,7 +417,8 @@ (image-size image t))))) (save-excursion (goto-char start) - (let ((alt-text (or alt-text (buffer-substring-no-properties start end)))) + (let ((alt-text (or alt-text + (buffer-substring-no-properties start end)))) (if (and image ;; Kludge to avoid displaying 30x30 gif images, which ;; seems to be a signal of a broken image. @@ -424,8 +426,9 @@ (glyphp image) (listp image)) (eq (if (featurep 'xemacs) - (let ((d (cdadar (specifier-spec-list - (glyph-image image))))) + (let ((d (cdadar + (specifier-spec-list + (glyph-image image))))) (and (vectorp d) (aref d 0))) (plist-get (cdr image) :type)) @@ -437,17 +440,21 @@ (delete-region start end) (gnus-put-image image alt-text 'external) (gnus-put-text-property start (point) 'help-echo alt-text) - (gnus-overlay-put (gnus-make-overlay start (point)) 'local-map - gnus-html-displayed-image-map) - (gnus-put-text-property start (point) 'gnus-alt-text alt-text) + (gnus-overlay-put + (gnus-make-overlay start (point)) 'local-map + gnus-html-displayed-image-map) + (gnus-put-text-property start (point) + 'gnus-alt-text alt-text) (when url - (gnus-put-text-property start (point) 'gnus-image-url url)) + (gnus-put-text-property start (point) + 'gnus-image-url url)) (gnus-add-image 'external image) t) ;; Bad image, try to show something else (when (fboundp 'find-image) (delete-region start end) - (setq image (find-image '((:type xpm :file "lock-broken.xpm")))) + (setq image (find-image + '((:type xpm :file "lock-broken.xpm")))) (gnus-put-image image alt-text 'internal) (gnus-add-image 'internal image)) nil)))))))) @@ -458,7 +465,8 @@ image (let* ((width (car size)) (height (cdr size)) - (edges (gnus-window-inside-pixel-edges (get-buffer-window (current-buffer)))) + (edges (gnus-window-inside-pixel-edges + (get-buffer-window (current-buffer)))) (window-width (truncate (* gnus-max-image-proportion (- (nth 2 edges) (nth 0 edges))))) (window-height (truncate (* gnus-max-image-proportion === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-10-01 11:15:10 +0000 +++ lisp/gnus/gnus-util.el 2010-10-03 00:33:27 +0000 @@ -44,11 +44,19 @@ (defmacro with-no-warnings (&rest body) `(progn ,@body)))) -(defcustom gnus-use-ido nil - "Whether to use `ido' for `completing-read'." +(defcustom gnus-completing-read-function 'gnus-emacs-completing-read + "Function use to do completing read." :version "24.1" :group 'gnus-meta - :type 'boolean) + :type '(radio (function-item + :doc "Use Emacs standard `completing-read' function." + gnus-emacs-completing-read) + (function-item + :doc "Use `ido-completing-read' function." + gnus-ido-completing-read) + (function-item + :doc "Use iswitchb based completing-read function." + gnus-iswitchb-completing-read))) (defcustom gnus-completion-styles (if (and (boundp 'completion-styles-alist) @@ -1585,17 +1593,46 @@ (defun gnus-completing-read (prompt collection &optional require-match initial-input history def) - "Call `completing-read' or `ido-completing-read'. -Depends on `gnus-use-ido'." + "Call `gnus-completing-read-function'." + (funcall gnus-completing-read-function + (concat prompt (when def + (concat " (default " def ")")) + ": ") + collection require-match initial-input history def)) + +(defun gnus-emacs-completing-read (prompt collection &optional require-match + initial-input history def) + "Call standard `completing-read-function'." (let ((completion-styles gnus-completion-styles)) - (funcall - (if gnus-use-ido - 'ido-completing-read - 'completing-read) - (concat prompt (when def - (concat " (default " def ")")) - ": ") - collection nil require-match initial-input history def))) + (completing-read prompt collection nil require-match initial-input history def))) + +(defun gnus-ido-completing-read (prompt collection &optional require-match + initial-input history def) + "Call `ido-completing-read-function'." + (require 'ido) + (ido-completing-read prompt collection nil require-match initial-input history def)) + +(defun gnus-iswitchb-completing-read (prompt collection &optional require-match + initial-input history def) + "`iswitchb' based completing-read function." + (require 'iswitchb) + (let ((iswitchb-make-buflist-hook + (lambda () + (setq iswitchb-temp-buflist + (let ((choices (append + (when initial-input (list initial-input)) + (symbol-value history) collection)) + filtered-choices) + (dolist (x choices) + (setq filtered-choices (adjoin x filtered-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-graphic-display-p () (if (featurep 'xemacs) === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/mm-decode.el 2010-10-03 00:33:27 +0000 @@ -105,7 +105,8 @@ ,disposition ,description ,cache ,id)) (defcustom mm-text-html-renderer - (cond ((executable-find "w3m") 'gnus-article-html) + (cond ((fboundp 'libxml-parse-html-region) 'mm-shr) + ((executable-find "w3m") 'gnus-article-html) ((executable-find "links") 'links) ((executable-find "lynx") 'lynx) ((locate-library "w3") 'w3) @@ -1674,6 +1675,14 @@ (and (eq (mm-body-7-or-8) '7bit) (not (mm-long-lines-p 76)))))) +(defun mm-shr (handle) + (let ((article-buffer (current-buffer))) + (unless handle + (setq handle (mm-dissect-buffer t))) + (shr-insert-document + (mm-with-part handle + (libxml-parse-html-region (point-min) (point-max)))))) + (provide 'mm-decode) ;;; mm-decode.el ends here === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-02 18:31:57 +0000 +++ lisp/gnus/shr.el 2010-10-03 00:33:27 +0000 @@ -30,6 +30,217 @@ ;;; Code: +(defgroup shr nil + "Simple HTML Renderer" + :group 'mail) + +(defcustom shr-max-image-proportion 0.9 + "How big pictures displayed are in relation to the window they're in. +A value of 0.7 means that they are allowed to take up 70% of the +width and height of the window. If they are larger than this, +and Emacs supports it, then the images will be rescaled down to +fit these criteria." + :version "24.1" + :group 'shr + :type 'float) + +(defcustom shr-blocked-images nil + "Images that have URLs matching this regexp will be blocked." + :version "24.1" + :group 'shr + :type 'regexp) + +(defvar shr-folding-mode nil) +(defvar shr-state nil) +(defvar shr-start nil) + +(defvar shr-width 70) + +(defun shr-transform-dom (dom) + (let ((result (list (pop dom)))) + (dolist (arg (pop dom)) + (push (cons (intern (concat ":" (symbol-name (car arg))) obarray) + (cdr arg)) + result)) + (dolist (sub dom) + (if (stringp sub) + (push (cons :text sub) result) + (push (shr-transform-dom sub) result))) + (nreverse result))) + +;;;###autoload +(defun shr-insert-document (dom) + (let ((shr-state nil) + (shr-start nil)) + (shr-descend (shr-transform-dom dom)))) + +(defun shr-descend (dom) + (let ((function (intern (concat "shr-" (symbol-name (car dom))) obarray))) + (if (fboundp function) + (funcall function (cdr dom)) + (shr-generic (cdr dom))))) + +(defun shr-generic (cont) + (dolist (sub cont) + (cond + ((eq (car sub) :text) + (shr-insert (cdr sub))) + ((consp (cdr sub)) + (shr-descend sub))))) + +(defun shr-p (cont) + (shr-ensure-newline) + (insert "\n") + (shr-generic cont) + (insert "\n")) + +(defun shr-b (cont) + (shr-fontize-cont cont 'bold)) + +(defun shr-i (cont) + (shr-fontize-cont cont 'italic)) + +(defun shr-u (cont) + (shr-fontize-cont cont 'underline)) + +(defun shr-s (cont) + (shr-fontize-cont cont 'strikethru)) + +(defun shr-fontize-cont (cont type) + (let (shr-start) + (shr-generic cont) + (shr-add-font shr-start (point) type))) + +(defun shr-add-font (start end type) + (let ((overlay (make-overlay start end))) + (overlay-put overlay 'face type))) + +(defun shr-a (cont) + (let ((url (cdr (assq :href cont))) + shr-start) + (shr-generic cont) + (widget-convert-button + 'link shr-start (point) + :action 'shr-browse-url + :url url + :keymap widget-keymap + :help-echo url))) + +(defun shr-browse-url (widget &rest stuff) + (browse-url (widget-get widget :url))) + +(defun shr-img (cont) + (let ((start (point-marker))) + (let ((alt (cdr (assq :alt cont))) + (url (cdr (assq :src cont)))) + (when (zerop (length alt)) + (setq alt "[img]")) + (cond + ((and shr-blocked-images + (string-match shr-blocked-images url)) + (insert alt)) + ((url-is-cached (browse-url-url-encode-chars url "[&)$ ]")) + (shr-put-image (shr-get-image-data url) (point) alt)) + (t + (insert alt) + (url-retrieve url 'shr-image-fetched + (list (current-buffer) start (point-marker)) + t))) + (insert " ") + (setq shr-state 'image)))) + +(defun shr-image-fetched (status buffer start end) + (when (and (buffer-name buffer) + (not (plist-get status :error))) + (url-store-in-cache (current-buffer)) + (when (or (search-forward "\n\n" nil t) + (search-forward "\r\n\r\n" nil t)) + (let ((data (buffer-substring (point) (point-max)))) + (with-current-buffer buffer + (let ((alt (buffer-substring start end)) + (inhibit-read-only t)) + (delete-region start end) + (shr-put-image data start alt)))))) + (kill-buffer (current-buffer))) + +(defun shr-put-image (data point alt) + (if (not (display-graphic-p)) + (insert alt) + (let ((image (shr-rescale-image data))) + (put-image image point alt)))) + +(defun shr-rescale-image (data) + (if (or (not (fboundp 'imagemagick-types)) + (not (get-buffer-window (current-buffer)))) + (create-image data nil t) + (let* ((image (create-image data nil t)) + (size (image-size image)) + (width (car size)) + (height (cdr size)) + (edges (window-inside-pixel-edges + (get-buffer-window (current-buffer)))) + (window-width (truncate (* shr-max-image-proportion + (- (nth 2 edges) (nth 0 edges))))) + (window-height (truncate (* shr-max-image-proportion + (- (nth 3 edges) (nth 1 edges))))) + scaled-image) + (when (> height window-height) + (setq image (or (create-image data 'imagemagick t + :height window-height) + image)) + (setq size (image-size image t))) + (when (> (car size) window-width) + (setq image (or + (create-image data 'imagemagick t + :width window-width) + image))) + image))) + +(defun shr-pre (cont) + (let ((shr-folding-mode nil)) + (shr-ensure-newline) + (shr-generic cont) + (shr-ensure-newline))) + +(defun shr-blockquote (cont) + (shr-pre cont)) + +(defun shr-ensure-newline () + (unless (zerop (current-column)) + (insert "\n"))) + +(defun shr-insert (text) + (when (eq shr-state 'image) + (insert "\n") + (setq shr-state nil)) + (cond + ((eq shr-folding-mode 'none) + (insert t)) + (t + (let (column) + (dolist (elem (split-string text)) + (setq column (current-column)) + (when (plusp column) + (if (> (+ column (length elem) 1) shr-width) + (insert "\n") + (insert " "))) + ;; The shr-start is a special variable that is used to pass + ;; upwards the first point in the buffer where the text really + ;; starts. + (unless shr-start + (setq shr-start (point))) + (insert elem)))))) + +(defun shr-get-image-data (url) + "Get image data for URL. +Return a string with image data." + (with-temp-buffer + (mm-disable-multibyte) + (url-cache-extract (url-cache-create-filename url)) + (when (or (search-forward "\n\n" nil t) + (search-forward "\r\n\r\n" nil t)) + (buffer-substring (point) (point-max))))) + (provide 'shr) ;;; shr.el ends here ------------------------------------------------------------ revno: 101735 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-10-02 20:03:44 -0400 message: * lisp/server.el (server-process-filter, server-return-error): Give emacsclient time to shut down after receiving an error string. * etc/NEWS: Document tweak to emacsclient exit status. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-10-02 08:24:14 +0000 +++ etc/NEWS 2010-10-03 00:03:44 +0000 @@ -66,10 +66,15 @@ * Changes in Emacs 24.1 -** New emacsclient argument --parent-id ID can be used to open a +** emacsclient changes + +*** New emacsclient argument --parent-id ID can be used to open a client frame in parent X window ID, via XEmbed. This works like the --parent-id argument to Emacs. +*** If emacsclient shuts down as a result of Emacs signalling an +error, its exit status is 1. + ** Completion can cycle, depending on completion-cycle-threshold. ** auto-mode-case-fold is now enabled by default. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-02 13:21:43 +0000 +++ lisp/ChangeLog 2010-10-03 00:03:44 +0000 @@ -1,3 +1,8 @@ +2010-10-03 Chong Yidong + + * server.el (server-process-filter, server-return-error): Give + emacsclient time to shut down after receiving an error string. + 2010-10-02 Michael Albinus * files.el (remote-file-name-inhibit-cache): New defcustom. === modified file 'lisp/server.el' --- lisp/server.el 2010-10-01 01:28:45 +0000 +++ lisp/server.el 2010-10-03 00:03:44 +0000 @@ -876,6 +876,9 @@ (server-log "Authentication failed" proc) (server-send-string proc (concat "-error " (server-quote-arg "Authentication failed"))) + ;; Before calling `delete-process', give emacsclient time to + ;; receive the error string and shut down on its own. + (sit-for 1) (delete-process proc) ;; We return immediately (return-from server-process-filter))) @@ -1129,6 +1132,9 @@ proc (concat "-error " (server-quote-arg (error-message-string err)))) (server-log (error-message-string err) proc) + ;; Before calling `delete-process', give emacsclient time to + ;; receive the error string and shut down on its own. + (sit-for 5) (delete-process proc))) (defun server-goto-line-column (line-col) ------------------------------------------------------------ revno: 101734 author: Wolfgang Schnerring committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-10-02 20:00:01 -0400 message: * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string (Bug#6963). diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-10-02 12:12:17 +0000 +++ lib-src/ChangeLog 2010-10-03 00:00:01 +0000 @@ -1,3 +1,8 @@ +2010-10-02 Wolfgang Schnerring (tiny change) + + * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an + error string (Bug#6963). + 2010-10-02 Juanma Barranquero * makefile.w32-in (tags): Remove target. === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2010-09-30 02:53:26 +0000 +++ lib-src/emacsclient.c 2010-10-03 00:00:01 +0000 @@ -1499,6 +1499,7 @@ char *cwd, *str; char string[BUFSIZ+1]; int null_socket_name, null_server_file, start_daemon_if_needed; + int exit_status = EXIT_SUCCESS; main_argv = argv; progname = argv[0]; @@ -1698,7 +1699,8 @@ fsync (1); /* Now, wait for an answer and print any messages. */ - while ((rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0) + while (exit_status == EXIT_SUCCESS + && (rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0) { char *p; string[rl] = '\0'; @@ -1737,6 +1739,7 @@ printf ("\n"); fprintf (stderr, "*ERROR*: %s", str); needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + exit_status = EXIT_FAILURE; } #ifdef SIGSTOP else if (strprefix ("-suspend ", string)) @@ -1754,7 +1757,8 @@ if (needlf) printf ("\n"); printf ("*ERROR*: Unknown message: %s", string); - needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] != '\n'; + needlf = string[0] + == '\0' ? needlf : string[strlen (string) - 1] != '\n'; } } @@ -1763,8 +1767,11 @@ fflush (stdout); fsync (1); + if (rl < 0) + exit_status = EXIT_FAILURE; + CLOSE_SOCKET (emacs_socket); - return EXIT_SUCCESS; + return exit_status; } #endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ ------------------------------------------------------------ revno: 101733 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-10-02 19:10:41 -0400 message: Add minor comment (Bug#7001). diff: === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-10-02 02:30:11 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-10-02 23:10:41 +0000 @@ -1801,12 +1801,13 @@ (erase-buffer) ;; (emacs-lisp-mode) (setq case-fold-search nil) - ;; This is a kludge. Some operating systems (OS/2, DOS) need to - ;; write files containing binary information specially. + ;; This is a kludge. Some operating systems (OS/2, DOS) need + ;; to write files containing binary information specially. ;; Under most circumstances, such files will be in binary ;; overwrite mode, so those OS's use that flag to guess how ;; they should write their data. Advise them that .elc files - ;; need to be written carefully. + ;; need to be written carefully. (There's no point running the + ;; mode hook, so don't call `binary-overwrite-mode'.) (setq overwrite-mode 'overwrite-mode-binary)) (displaying-byte-compile-warnings (with-current-buffer bytecomp-inbuffer ------------------------------------------------------------ revno: 101732 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-10-02 20:31:57 +0200 message: lisp/gnus/shr.el (shr): Fix typo in provide call. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-02 10:30:06 +0000 +++ lisp/gnus/ChangeLog 2010-10-02 18:31:57 +0000 @@ -1,3 +1,7 @@ +2010-10-02 Juanma Barranquero + + * shr.el (shr): Fix typo in provide call. + 2010-10-02 Lars Magne Ingebrigtsen * shr.el: New file. === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-02 10:30:06 +0000 +++ lisp/gnus/shr.el 2010-10-02 18:31:57 +0000 @@ -30,6 +30,6 @@ ;;; Code: -(provice 'shr) +(provide 'shr) ;;; shr.el ends here ------------------------------------------------------------ revno: 101731 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2010-10-02 14:07:02 +0000 message: gnus.texi (Splitting Mail): Fix @xref syntax. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-01 23:14:58 +0000 +++ doc/misc/ChangeLog 2010-10-02 14:07:02 +0000 @@ -1,3 +1,7 @@ +2010-10-02 Lars Magne Ingebrigtsen + + * gnus.texi (Splitting Mail): Fix @xref syntax. + 2010-10-01 Lars Magne Ingebrigtsen * gnus.texi (Splitting Mail): Mention the new fancy splitting === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-10-01 23:08:25 +0000 +++ doc/misc/gnus.texi 2010-10-02 14:07:02 +0000 @@ -15110,8 +15110,8 @@ 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. +This variable can also be a fancy split method. For the syntax, +@pxref{Fancy Mail Splitting}. 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; ------------------------------------------------------------ revno: 101730 committer: Michael Albinus branch nick: trunk timestamp: Sat 2010-10-02 15:21:43 +0200 message: * files.el (remote-file-name-inhibit-cache): New defcustom. * time.el (display-time-file-nonempty-p): Use `remote-file-name-inhibit-cache'. * net/tramp.el (tramp-completion-reread-directory-timeout): Fix docstring. * net/tramp-cache.el (tramp-cache-inhibit-cache): Remove. (tramp-get-file-property): Replace `tramp-cache-inhibit-cache' by `remote-file-name-inhibit-cache'. Check also for an integer value. Add/increase counter when `tramp-verbose' >= 10. (tramp-set-file-property): Add/increase counter when `tramp-verbose' >= 10. * net/tramp-cmds.el (tramp-cleanup-all-connections) (tramp-cleanup-all-buffers): Set tramp-autoload cookie. (tramp-bug): Set tramp-autoload cookie. Report all interned tramp-* variables. Report also `remote-file-name-inhibit-cache'. (tramp-reporter-dump-variable): Fix docstring. Mask non-7bit characters only in strings. * net/tramp-compat.el (remote-file-name-inhibit-cache): Define due to backward compatibility. * net/tramp-sh.el (tramp-handle-verify-visited-file-modtime) (tramp-handle-file-name-all-completions) (tramp-handle-vc-registered): Use `remote-file-name-inhibit-cache'. (tramp-open-connection-setup-interactive-shell): Call `tramp-cleanup-connection' directly. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-02 02:46:13 +0000 +++ lisp/ChangeLog 2010-10-02 13:21:43 +0000 @@ -1,3 +1,37 @@ +2010-10-02 Michael Albinus + + * files.el (remote-file-name-inhibit-cache): New defcustom. + + * time.el (display-time-file-nonempty-p): Use + `remote-file-name-inhibit-cache'. + + * net/tramp.el (tramp-completion-reread-directory-timeout): Fix + docstring. + + * net/tramp-cache.el (tramp-cache-inhibit-cache): Remove. + (tramp-get-file-property): Replace `tramp-cache-inhibit-cache' by + `remote-file-name-inhibit-cache'. Check also for an integer + value. Add/increase counter when `tramp-verbose' >= 10. + (tramp-set-file-property): Add/increase counter when + `tramp-verbose' >= 10. + + * net/tramp-cmds.el (tramp-cleanup-all-connections) + (tramp-cleanup-all-buffers): Set tramp-autoload cookie. + (tramp-bug): Set tramp-autoload cookie. Report all interned + tramp-* variables. Report also `remote-file-name-inhibit-cache'. + (tramp-reporter-dump-variable): Fix docstring. Mask non-7bit + characters only in strings. + + * net/tramp-compat.el (remote-file-name-inhibit-cache): Define due + to backward compatibility. + + * net/tramp-sh.el (tramp-handle-verify-visited-file-modtime) + (tramp-handle-file-name-all-completions) + (tramp-handle-vc-registered): Use + `remote-file-name-inhibit-cache'. + (tramp-open-connection-setup-interactive-shell): Call + `tramp-cleanup-connection' directly. + 2010-10-02 Glenn Morris * emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias. === modified file 'lisp/files.el' --- lisp/files.el 2010-10-01 03:57:26 +0000 +++ lisp/files.el 2010-10-02 13:21:43 +0000 @@ -949,6 +949,36 @@ (funcall handler 'file-remote-p file identification connected) nil))) +(defcustom remote-file-name-inhibit-cache 10 + "Whether to use the remote file-name cache for read access. + +When `nil', always use the cached values. +When `t', never use them. +A number means use them for that amount of seconds since they were +cached. + +File attributes of remote files are cached for better performance. +If they are changed out of Emacs' control, the cached values +become invalid, and must be invalidated. + +In case a remote file is checked regularly, it might be +reasonable to let-bind this variable to a value less then the +time period between two checks. +Example: + + \(defun display-time-file-nonempty-p \(file) + \(let \(\(remote-file-name-inhibit-cache \(- display-time-interval 5))) + \(and \(file-exists-p file) + \(< 0 \(nth 7 \(file-attributes \(file-chase-links file)))))))" + :group 'files + :version "24.1" + :type `(choice + (const :tag "Do not inhibit file name cache" nil) + (const :tag "Do not use file name cache" t) + (integer :tag "Do not use file name cache" + :format "Do not use file name cache older then %v seconds" + :value 10))) + (defun file-local-copy (file) "Copy the file FILE into a temporary file on this machine. Returns the name of the local copy, or nil, if FILE is directly === modified file 'lisp/net/tramp-cache.el' --- lisp/net/tramp-cache.el 2010-09-15 20:27:11 +0000 +++ lisp/net/tramp-cache.el 2010-10-02 13:21:43 +0000 @@ -59,13 +59,6 @@ (defvar tramp-cache-data (make-hash-table :test 'equal) "Hash table for remote files properties.") -(defvar tramp-cache-inhibit-cache nil - "Inhibit cache read access, when `t'. -`nil' means to accept cache entries unconditionally. If the -value is a timestamp (as returned by `current-time'), cache -entries are not used when they have been written before this -time.") - (defcustom tramp-persistency-file-name (cond ;; GNU Emacs. @@ -104,19 +97,25 @@ (value (when (hash-table-p hash) (gethash property hash)))) (if ;; We take the value only if there is any, and - ;; `tramp-cache-inhibit-cache' indicates that it is still + ;; `remote-file-name-inhibit-cache' indicates that it is still ;; valid. Otherwise, DEFAULT is set. (and (consp value) - (or (null tramp-cache-inhibit-cache) - (and (consp tramp-cache-inhibit-cache) + (or (null remote-file-name-inhibit-cache) + (and (integerp remote-file-name-inhibit-cache) + (<= + (tramp-time-diff (current-time) (car value)) + remote-file-name-inhibit-cache)) + (and (consp remote-file-name-inhibit-cache) (tramp-time-less-p - tramp-cache-inhibit-cache (car value))))) + remote-file-name-inhibit-cache (car value))))) (setq value (cdr value)) (setq value default)) - (if (consp tramp-cache-inhibit-cache) - (tramp-message vec 1 "%s %s %s" file property value)) (tramp-message vec 8 "%s %s %s" file property value) + (when (>= tramp-verbose 10) + (let* ((var (intern (concat "tramp-cache-get-count-" property))) + (val (or (ignore-errors (symbol-value var)) 0))) + (set var (1+ val)))) value)) ;;;###tramp-autoload @@ -132,6 +131,10 @@ ;; We put the timestamp there. (puthash property (cons (current-time) value) hash) (tramp-message vec 8 "%s %s %s" file property value) + (when (>= tramp-verbose 10) + (let* ((var (intern (concat "tramp-cache-set-count-" property))) + (val (or (ignore-errors (symbol-value var)) 0))) + (set var (1+ val)))) value)) ;;;###tramp-autoload === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2010-09-16 20:43:12 +0000 +++ lisp/net/tramp-cmds.el 2010-10-02 13:21:43 +0000 @@ -99,6 +99,7 @@ (tramp-get-connection-property vec "process-buffer" nil))) (when (bufferp buf) (kill-buffer buf))))) +;;;###tramp-autoload (defun tramp-cleanup-all-connections () "Flush all Tramp internal objects. This includes password cache, file cache, connection cache, buffers." @@ -117,6 +118,7 @@ (dolist (name (tramp-list-tramp-buffers)) (when (bufferp (get-buffer name)) (kill-buffer name)))) +;;;###tramp-autoload (defun tramp-cleanup-all-buffers () "Kill all remote buffers." (interactive) @@ -141,6 +143,7 @@ (autoload 'reporter-submit-bug-report "reporter") +;;;###tramp-autoload (defun tramp-bug () "Submit a bug report to the Tramp developers." (interactive) @@ -150,65 +153,25 @@ (reporter-submit-bug-report tramp-bug-report-address ; to-address (format "tramp (%s)" tramp-version) ; package name and version - (delq nil - `(;; Current state - tramp-current-method - tramp-current-user - tramp-current-host - - ;; System defaults - tramp-auto-save-directory ; vars to dump - tramp-default-method - tramp-default-method-alist - tramp-default-host - tramp-default-proxies-alist - tramp-default-user - tramp-default-user-alist - tramp-rsh-end-of-line - tramp-default-password-end-of-line - tramp-login-prompt-regexp - ;; Mask non-7bit characters - (tramp-password-prompt-regexp . tramp-reporter-dump-variable) - tramp-wrong-passwd-regexp - tramp-yesno-prompt-regexp - tramp-yn-prompt-regexp - tramp-terminal-prompt-regexp - tramp-temp-name-prefix - tramp-file-name-structure - tramp-file-name-regexp - tramp-methods - tramp-end-of-output - tramp-local-coding-commands - tramp-remote-coding-commands - tramp-actions-before-shell - tramp-actions-copy-out-of-band - tramp-terminal-type - ;; Mask non-7bit characters - (tramp-shell-prompt-pattern . tramp-reporter-dump-variable) - ,(when (boundp 'tramp-backup-directory-alist) - 'tramp-backup-directory-alist) - ,(when (boundp 'tramp-bkup-backup-directory-info) - 'tramp-bkup-backup-directory-info) - ;; Dump cache. - (tramp-cache-data . tramp-reporter-dump-variable) - - ;; Non-tramp variables of interest - ;; Mask non-7bit characters - (shell-prompt-pattern . tramp-reporter-dump-variable) - backup-by-copying - backup-by-copying-when-linked - backup-by-copying-when-mismatch - ,(when (boundp 'backup-by-copying-when-privileged-mismatch) - 'backup-by-copying-when-privileged-mismatch) - ,(when (boundp 'password-cache) - 'password-cache) - ,(when (boundp 'password-cache-expiry) - 'password-cache-expiry) - ,(when (boundp 'backup-directory-alist) - 'backup-directory-alist) - ,(when (boundp 'bkup-backup-directory-info) - 'bkup-backup-directory-info) - file-name-handler-alist)) + (sort + (delq nil (mapcar + (lambda (x) + (and x (boundp x) (cons x 'tramp-reporter-dump-variable))) + (append + (mapcar 'intern (all-completions "tramp-" obarray 'boundp)) + ;; Non-tramp variables of interest. + '(shell-prompt-pattern + backup-by-copying + backup-by-copying-when-linked + backup-by-copying-when-mismatch + backup-by-copying-when-privileged-mismatch + backup-directory-alist + bkup-backup-directory-info + password-cache + password-cache-expiry + remote-file-name-inhibit-cache + file-name-handler-alist)))) + (lambda (x y) (string< (symbol-name (car x)) (symbol-name (car y))))) 'tramp-load-report-modules ; pre-hook 'tramp-append-tramp-buffers ; post-hook @@ -238,8 +201,7 @@ ")))) (defun tramp-reporter-dump-variable (varsym mailbuf) - "Pretty-print the value of the variable in symbol VARSYM. -Used for non-7bit chars in strings." + "Pretty-print the value of the variable in symbol VARSYM." (let* ((reporter-eval-buffer (symbol-value 'reporter-eval-buffer)) (val (with-current-buffer reporter-eval-buffer (symbol-value varsym)))) @@ -247,12 +209,13 @@ (if (hash-table-p val) ;; Pretty print the cache. (set varsym (read (format "(%s)" (tramp-cache-print val)))) - ;; There are characters to be masked. + ;; There are non-7bit characters to be masked. (when (and (boundp 'mm-7bit-chars) + (stringp val) (string-match (concat "[^" (symbol-value 'mm-7bit-chars) "]") val)) (with-current-buffer reporter-eval-buffer - (set varsym (format "(base64-decode-string \"%s\"" + (set varsym (format "(base64-decode-string \"%s\")" (base64-encode-string val)))))) ;; Dump variable. @@ -268,7 +231,7 @@ "\\(\")\\)" "\"$")) ;; \4 " (replace-match "\\1\\2\\3\\4") (beginning-of-line) - (insert " ;; variable encoded due to non-printable characters\n")) + (insert " ;; Variable encoded due to non-printable characters.\n")) (forward-line 1)) ;; Reset VARSYM to old value. @@ -277,7 +240,6 @@ (defun tramp-load-report-modules () "Load needed modules for reporting." - ;; We load message.el and mml.el from Gnus. (if (featurep 'xemacs) (progn @@ -290,7 +252,6 @@ (defun tramp-append-tramp-buffers () "Append Tramp buffers and buffer local variables into the bug report." - (goto-char (point-max)) ;; Dump buffer local variables. === modified file 'lisp/net/tramp-compat.el' --- lisp/net/tramp-compat.el 2010-09-17 07:58:07 +0000 +++ lisp/net/tramp-compat.el 2010-10-02 13:21:43 +0000 @@ -96,6 +96,11 @@ (defvar byte-compile-not-obsolete-vars nil)) (setq byte-compile-not-obsolete-vars '(directory-sep-char)) + ;; `remote-file-name-inhibit-cache' has been introduced with Emacs 24.1. + ;; Besides `t', `nil', and integer, we use also timestamps (as + ;; returned by `current-time') internally. + (defvar remote-file-name-inhibit-cache nil) + ;; For not existing functions, or functions with a changed argument ;; list, there are compiler warnings. We want to avoid them in ;; cases we know what we do. === modified file 'lisp/net/tramp-gvfs.el' --- lisp/net/tramp-gvfs.el 2010-09-15 20:27:11 +0000 +++ lisp/net/tramp-gvfs.el 2010-10-02 13:21:43 +0000 @@ -531,7 +531,6 @@ (defun tramp-gvfs-dbus-event-error (event err) "Called when a D-Bus error message arrives, see `dbus-event-error-hooks'." (when tramp-gvfs-dbus-event-vector - ;(tramp-cleanup-connection tramp-gvfs-dbus-event-vector) (tramp-message tramp-gvfs-dbus-event-vector 10 "%S" event) (tramp-error tramp-gvfs-dbus-event-vector 'file-error "%s" (cadr err)))) === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2010-09-15 20:27:11 +0000 +++ lisp/net/tramp-sh.el 2010-10-02 13:21:43 +0000 @@ -1366,8 +1366,8 @@ (not (tramp-file-name-handler 'file-remote-p f nil 'connected))) t (with-parsed-tramp-file-name f nil - (tramp-flush-file-property v localname) - (let* ((attr (file-attributes f)) + (let* ((remote-file-name-inhibit-cache t) + (attr (file-attributes f)) (modtime (nth 5 attr)) (mt (visited-file-modtime))) @@ -1770,46 +1770,39 @@ (mapcar 'list (or - ;; Try cache first - (and - ;; Ignore if expired - (or (not (integerp tramp-completion-reread-directory-timeout)) - (<= (tramp-time-diff - (current-time) - (tramp-get-file-property - v localname "last-completion" '(0 0 0))) - tramp-completion-reread-directory-timeout)) - - ;; Try cache entries for filename, filename with last - ;; character removed, filename with last two characters - ;; removed, ..., and finally the empty string - all - ;; concatenated to the local directory name - - ;; This is inefficient for very long filenames, pity - ;; `reduce' is not available... - (car - (apply - 'append - (mapcar - (lambda (x) - (let ((cache-hit - (tramp-get-file-property - v - (concat localname (substring filename 0 x)) - "file-name-all-completions" - nil))) - (when cache-hit (list cache-hit)))) - (tramp-compat-number-sequence (length filename) 0 -1))))) + ;; Try cache entries for filename, filename with last + ;; character removed, filename with last two characters + ;; removed, ..., and finally the empty string - all + ;; concatenated to the local directory name. + (let ((remote-file-name-inhibit-cache + (or remote-file-name-inhibit-cache + tramp-completion-reread-directory-timeout))) + + ;; This is inefficient for very long filenames, pity + ;; `reduce' is not available... + (car + (apply + 'append + (mapcar + (lambda (x) + (let ((cache-hit + (tramp-get-file-property + v + (concat localname (substring filename 0 x)) + "file-name-all-completions" + nil))) + (when cache-hit (list cache-hit)))) + (tramp-compat-number-sequence (length filename) 0 -1))))) ;; Cache expired or no matching cache entry found so we need - ;; to perform a remote operation + ;; to perform a remote operation. (let (result) ;; Get a list of directories and files, including reliably ;; tagging the directories with a trailing '/'. Because I ;; rock. --daniel@danann.net ;; Changed to perform `cd' in the same remote op and only - ;; get entries starting with `filename'. Capture any `cd' + ;; get entries starting with `filename'. Capture any `cd' ;; error messages. Ensure any `cd' and `echo' aliases are ;; ignored. (tramp-send-command @@ -1904,9 +1897,6 @@ v (concat localname entry) "file-exists-p" t)) result) - (tramp-set-file-property - v localname "last-completion" (current-time)) - ;; Store result in the cache (tramp-set-file-property v (concat localname filename) @@ -3669,7 +3659,7 @@ ;; There could be new files, created by the vc backend. We ;; cannot reuse the old cache entries, therefore. (let (tramp-vc-registered-file-names - (tramp-cache-inhibit-cache (current-time)) + (remote-file-name-inhibit-cache (current-time)) (file-name-handler-alist `((,tramp-file-name-regexp . tramp-vc-file-name-handler)))) @@ -4085,7 +4075,7 @@ ;; Keep the debug buffer. (rename-buffer (generate-new-buffer-name tramp-temp-buffer-name) 'unique) - (tramp-compat-funcall 'tramp-cleanup-connection vec) + (tramp-cleanup-connection vec) (if (= (point-min) (point-max)) (kill-buffer nil) (rename-buffer (tramp-debug-buffer-name vec) 'unique)) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-09-15 20:27:11 +0000 +++ lisp/net/tramp.el 2010-10-02 13:21:43 +0000 @@ -974,8 +974,8 @@ make it visible during file name completion in the minibuffer, Tramp flushes its cache and rereads the directory contents when more than `tramp-completion-reread-directory-timeout' seconds -have been gone since last remote command execution. A value of 0 -would require an immediate reread during filename completion, nil +have been gone since last remote command execution. A value of `t' +would require an immediate reread during filename completion, `nil' means to use always cached values for the directory contents." :group 'tramp :type '(choice (const nil) integer)) === modified file 'lisp/time.el' --- lisp/time.el 2010-07-27 02:10:05 +0000 +++ lisp/time.el 2010-10-02 13:21:43 +0000 @@ -454,8 +454,9 @@ (force-mode-line-update)) (defun display-time-file-nonempty-p (file) - (and (file-exists-p file) - (< 0 (nth 7 (file-attributes (file-chase-links file)))))) + (let ((remote-file-name-inhibit-cache (- display-time-interval 5))) + (and (file-exists-p file) + (< 0 (nth 7 (file-attributes (file-chase-links file))))))) ;;;###autoload (define-minor-mode display-time-mode ------------------------------------------------------------ revno: 101729 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sat 2010-10-02 14:34:02 +0200 message: (url-lazy-message): Remove leftover debugging code. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-10-02 02:04:20 +0000 +++ lisp/url/ChangeLog 2010-10-02 12:34:02 +0000 @@ -3,6 +3,7 @@ * url-util.el (url-display-percentage): Don't message when the URL is silent. (url-lazy-message): Ditto. + (url-lazy-message): Remove leftover debugging code. * url-http.el (url-http-parse-headers): Pass the SILENT parameter back to the fetching function. === modified file 'lisp/url/url-util.el' --- lisp/url/url-util.el 2010-10-02 02:04:20 +0000 +++ lisp/url/url-util.el 2010-10-02 12:34:02 +0000 @@ -184,10 +184,6 @@ (= 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 ------------------------------------------------------------ revno: 101728 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-10-02 14:12:17 +0200 message: Rework tags targets in Windows makefiles to protect against old/stupid makes. * lib-src/makefile.w32-in (tags): Remove target. * src/makefile.w32-in (tags): Rename target to full-tags. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-10-01 11:45:16 +0000 +++ lib-src/ChangeLog 2010-10-02 12:12:17 +0000 @@ -1,3 +1,7 @@ +2010-10-02 Juanma Barranquero + + * makefile.w32-in (tags): Remove target. + 2010-10-01 Eli Zaretskii * makefile.w32-in (tags, TAGS): New targets. === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2010-10-01 11:45:16 +0000 +++ lib-src/makefile.w32-in 2010-10-02 12:12:17 +0000 @@ -380,7 +380,6 @@ ### TAGS ### -tags: TAGS TAGS: $(BLD)/etags.exe *.c *.h $(BLD)/etags.exe *.c *.h === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-02 08:24:14 +0000 +++ src/ChangeLog 2010-10-02 12:12:17 +0000 @@ -1,3 +1,7 @@ +2010-10-02 Juanma Barranquero + + * makefile.w32-in (tags): Rename target to full-tags. + 2010-10-02 Eli Zaretskii * emacs.c (main): Remove !WINDOWSNT conditional. === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2010-10-01 11:45:16 +0000 +++ src/makefile.w32-in 2010-10-02 12:12:17 +0000 @@ -335,8 +335,8 @@ echo This target is not supported with NMake exit -1 -tags: TAGS TAGS-LISP ../nt/TAGS -.PHONY: tags +full-tags: TAGS TAGS-LISP ../nt/TAGS +.PHONY: full-tags ### DEPENDENCIES ### ------------------------------------------------------------ revno: 101727 author: Ludovic Courtes committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2010-10-02 10:35:45 +0000 message: Add lisp/gnus/nnregistry.el. diff: === added file 'lisp/gnus/nnregistry.el' --- lisp/gnus/nnregistry.el 1970-01-01 00:00:00 +0000 +++ lisp/gnus/nnregistry.el 2010-10-02 10:35:45 +0000 @@ -0,0 +1,65 @@ +;;; nnregistry.el --- access to articles via Gnus' message-id registry +;;; -*- coding: utf-8 -*- + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; Authors: Ludovic Courtès +;; Keywords: news, mail + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This file provides the `nnregistry' Gnus back-end. It can be used +;; in `gnus-refer-article-method' to quickly search for a message by +;; id, regardless of the back-end that stores it. + +;;; Code: + +(require 'nnoo) +(require 'gnus-registry) +(require 'gnus-int) + +(nnoo-declare nnregistry) + +(deffoo nnregistry-server-opened (server) + (eq gnus-registry-install t)) + +(deffoo nnregistry-close-server (server) + t) + +(deffoo nnregistry-status-message (server) + nil) + +(deffoo nnregistry-open-server (server &optional defs) + (eq gnus-registry-install t)) + +(defvar nnregistry-within-nnregistry nil) + +(deffoo nnregistry-request-article (id &optional group server buffer) + (and (not nnregistry-within-nnregistry) + (let* ((nnregistry-within-nnregistry t) + (group (gnus-registry-fetch-group id)) + (gnus-override-method nil)) + (message "nnregistry: requesting article `%s' in group `%s'" + id group) + (and group + (gnus-check-group group) + (gnus-request-article id group buffer))))) + +(provide 'nnregistry) + +;;; nnregistry.el ends here ------------------------------------------------------------ revno: 101726 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2010-10-02 10:30:06 +0000 message: Merge changes made in Gnus trunk. gnus-topic.el (gnus-topic-move-group): Fix the syntax of the completing read. gnus-html.el (gnus-html-schedule-image-fetching): Be silent. shr.el: New file. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-01 23:08:25 +0000 +++ lisp/gnus/ChangeLog 2010-10-02 10:30:06 +0000 @@ -1,3 +1,12 @@ +2010-10-02 Lars Magne Ingebrigtsen + + * shr.el: New file. + + * gnus-html.el (gnus-html-schedule-image-fetching): Be silent. + + * gnus-topic.el (gnus-topic-move-group): Fix the syntax of the + completing read. + 2010-10-01 Lars Magne Ingebrigtsen * gnus-start.el (gnus-check-bogus-newsgroups): Say how many groups === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-10-01 13:33:03 +0000 +++ lisp/gnus/gnus-html.el 2010-10-02 10:30:06 +0000 @@ -37,6 +37,7 @@ (require 'url-cache) (require 'xml) (require 'browse-url) +(require 'help-fns) (defcustom gnus-html-image-cache-ttl (days-to-time 7) "Time used to determine if we should use images from the cache." @@ -368,10 +369,12 @@ "Retrieve IMAGE, and place it into BUFFER on arrival." (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, image %s" buffer image) - (ignore-errors - (url-retrieve (car image) - 'gnus-html-image-fetched - (list buffer image)))) + (let ((args (list (car image) + 'gnus-html-image-fetched + (list buffer image)))) + (when (> (length (help-function-arglist 'url-retrieve)) 4) + (setq args (nconc args (list t)))) + (apply #'url-retrieve args))) (defun gnus-html-image-fetched (status buffer image) "Callback function called when image has been fetched." === modified file 'lisp/gnus/gnus-topic.el' --- lisp/gnus/gnus-topic.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/gnus-topic.el 2010-10-02 10:30:06 +0000 @@ -1302,7 +1302,7 @@ (interactive (list current-prefix-arg (gnus-completing-read "Move to topic" (mapcar 'car gnus-topic-alist) t - 'gnus-topic-history))) + nil 'gnus-topic-history))) (let ((use-marked (and (not n) (not (gnus-region-active-p)) gnus-group-marked t)) (groups (gnus-group-process-prefix n)) @@ -1348,7 +1348,8 @@ "Copy the current group to a topic." (interactive (list current-prefix-arg - (gnus-completing-read "Copy to topic" (mapcar 'car gnus-topic-alist) t))) + (gnus-completing-read + "Copy to topic" (mapcar 'car gnus-topic-alist) t))) (gnus-topic-move-group n topic t)) (defun gnus-topic-kill-group (&optional n discard) === added file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 1970-01-01 00:00:00 +0000 +++ lisp/gnus/shr.el 2010-10-02 10:30:06 +0000 @@ -0,0 +1,35 @@ +;;; shr.el --- Simple HTML Renderer + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen +;; Keywords: html + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This package takes a HTML parse tree (as provided by +;; libxml-parse-html-region) and renders it in the current buffer. It +;; does not do CSS, JavaScript or anything advanced: It's geared +;; towards rendering typical short snippets of HTML, like what you'd +;; find in HTML email and the like. + +;;; Code: + +(provice 'shr) + +;;; shr.el ends here ------------------------------------------------------------ revno: 101725 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-10-02 11:08:47 +0200 message: Improve TAGS target on MS-DOS. msdos/mainmake.v2 (TAGS tags): Use `find' to filter out loaddefs files. Make all file names in TAGS tables absolute. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-10-01 19:20:29 +0000 +++ msdos/ChangeLog 2010-10-02 09:08:47 +0000 @@ -1,3 +1,8 @@ +2010-10-02 Eli Zaretskii + + * mainmake.v2 (TAGS tags): Use `find' to filter out loaddefs + files. Make all file names in TAGS tables absolute. + 2010-10-01 Eli Zaretskii * sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): Edit to empty. === modified file 'msdos/mainmake.v2' --- msdos/mainmake.v2 2010-08-20 19:45:24 +0000 +++ msdos/mainmake.v2 2010-10-02 09:08:47 +0000 @@ -147,16 +147,21 @@ # We cannot use [a-zA-Z]* like the mainline distribution does, because # that causes all file names to be returned in upper-case on DOS... +# Must use `find' to filter out loaddefs files; ignore errors if `find' +# is not available or is an MS `find'. +# The "cd $(CURDIR)" gork is for when `find' fails and leaves us inside +# `lisp' or one of its subdirectories. TAGS tags: lib-src FRC cd lib-src if exist etags.exe mv -f etags.exe ../bin cd .. - cd lisp - ../bin/etags .../*.el - cd .. + - find $(CURDIR)/lisp -iname "*.el" -a -! -( -iname "*loaddefs.el" -o -iname "ldefs-boot.el" -) | ./bin/etags -o lisp/TAGS - + cd $(CURDIR) cd src ../bin/etags --include=../lisp/TAGS \ - '--regex=/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' *.c *.h s/msdos.h m/intel386.h + --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ + $(CURDIR)/src/*.c $(CURDIR)/src/*.h \ + $(CURDIR)/src/s/msdos.h $(CURDIR)/src/m/intel386.h cd .. ./bin/etags --include=src/TAGS ------------------------------------------------------------ revno: 101724 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-10-02 10:24:14 +0200 message: Invoke kill-emacs on SIGINT on Windows as well. src/emacs.c (main): Remove !WINDOWSNT conditional. (Fkill_emacs): Don't mention exemption on MS-Windows. etc/NEWS: Fix the news entry regarding SIGINT in batch mode. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-10-02 02:46:13 +0000 +++ etc/NEWS 2010-10-02 08:24:14 +0000 @@ -150,7 +150,7 @@ 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. +and SIGHUP, and upon SIGINT in batch mode. ** kill-emacs-hook is now also run in batch mode. === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-02 02:46:13 +0000 +++ src/ChangeLog 2010-10-02 08:24:14 +0000 @@ -1,3 +1,8 @@ +2010-10-02 Eli Zaretskii + + * emacs.c (main): Remove !WINDOWSNT conditional. + (Fkill_emacs): Don't mention exemption on MS-Windows. + 2010-10-02 Glenn Morris * character.c (Fchar_bytes): Remove obsolete function. === modified file 'src/emacs.c' --- src/emacs.c 2010-10-02 02:30:11 +0000 +++ src/emacs.c 2010-10-02 08:24:14 +0000 @@ -1240,14 +1240,12 @@ #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 + if (noninteractive) signal (SIGINT, fatal_error_signal); signal (SIGTERM, fatal_error_signal); #ifdef SIGXCPU signal (SIGXCPU, fatal_error_signal); @@ -1997,7 +1995,7 @@ 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. +or SIGHUP, and upon SIGINT in batch mode. The value of `kill-emacs-hook', if not void, is a list of functions (of no args), ------------------------------------------------------------ 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);