Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102343. ------------------------------------------------------------ revno: 102343 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 20:11:33 -0800 message: esh-opt comments. diff: === modified file 'lisp/eshell/esh-opt.el' --- lisp/eshell/esh-opt.el 2010-01-13 08:35:10 +0000 +++ lisp/eshell/esh-opt.el 2010-11-11 04:11:33 +0000 @@ -64,10 +64,9 @@ macro-args (list 'eshell-stringify-list (list 'eshell-flatten-list macro-args))))) - (let ,(append (mapcar (function - (lambda (opt) - (or (and (listp opt) (nth 3 opt)) - 'eshell-option-stub))) + (let ,(append (mapcar (lambda (opt) + (or (and (listp opt) (nth 3 opt)) + 'eshell-option-stub)) (cadr options)) '(usage-msg last-value ext-command args)) (eshell-do-opt ,name ,options (quote ,body-forms))))) @@ -78,6 +77,7 @@ (defvar last-value) (defvar usage-msg) (defvar ext-command) +;; Documented part of the interface; see eshell-eval-using-options. (defvar args) (defun eshell-do-opt (name options body-forms) @@ -224,5 +224,4 @@ (setq index (1+ index))))))))) args) -;; arch-tag: 45c6c2d0-8091-46a1-a205-2f4bafd8230c ;;; esh-opt.el ends here ------------------------------------------------------------ revno: 102342 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 20:10:38 -0800 message: mailheader.el comments. diff: === modified file 'lisp/mail/mailheader.el' --- lisp/mail/mailheader.el 2010-08-29 16:17:13 +0000 +++ lisp/mail/mailheader.el 2010-11-11 04:10:38 +0000 @@ -1,7 +1,7 @@ ;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Erik Naggum ;; Keywords: tools, mail, news @@ -49,9 +49,6 @@ (eval-when-compile (require 'cl)) -;; Make the byte-compiler shut up. -(defvar headers) - (defun mail-header-extract () "Extract headers from current buffer after point. Returns a header alist, where each element is a cons cell (name . value), @@ -105,6 +102,9 @@ (cons (cdr header) (funcall (cdr rule) (cdr header)))))))) headers) +;; Advertized part of the interface; see mail-header, mail-header-set. +(defvar headers) + (defsubst mail-header (header &optional header-alist) "Return the value associated with header HEADER in HEADER-ALIST. If the value is a string, it is the original value of the header. If the @@ -191,5 +191,4 @@ (provide 'mailheader) -;; arch-tag: 6e7aa221-80b5-4b3d-b46f-fd66ab567be0 ;;; mailheader.el ends here ------------------------------------------------------------ revno: 102341 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 20:09:02 -0800 message: Regenerate tpu-edt autoloads. diff: === modified file 'lisp/emulation/tpu-edt.el' --- lisp/emulation/tpu-edt.el 2010-08-29 16:17:13 +0000 +++ lisp/emulation/tpu-edt.el 2010-11-11 04:09:02 +0000 @@ -2438,7 +2438,7 @@ ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins -;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "78abc50917c93d2b35596d307fc638c4") +;;;;;; tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "fe5b7795d6b6720a98b805ee47a08bdf") ;;; Generated autoloads from tpu-extras.el (autoload 'tpu-cursor-free-mode "tpu-extras" "\ ------------------------------------------------------------ revno: 102340 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 20:07:40 -0800 message: * lisp/gnus/smime.el (from): Restrict declaration to XEmacs. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-11 04:05:15 +0000 +++ lisp/gnus/ChangeLog 2010-11-11 04:07:40 +0000 @@ -1,5 +1,7 @@ 2010-11-11 Glenn Morris + * smime.el (from): Restrict declaration to XEmacs. + * nnir.el (gnus-group-topic-name): Autoload. 2010-11-11 Katsumi Yamaoka === modified file 'lisp/gnus/smime.el' --- lisp/gnus/smime.el 2010-11-11 01:45:05 +0000 +++ lisp/gnus/smime.el 2010-11-11 04:07:40 +0000 @@ -426,7 +426,9 @@ (insert-buffer-substring smime-details-buffer) nil)) -(defvar from) ;; Necessary for XEmacs to silence the byte compiler. +;; TODO: fix this properly by giving it a prefix. +(if (featurep 'xemacs) + (defvar from)) (defun smime-decrypt-region (b e keyfile) "Decrypt S/MIME message in region between B and E with key in KEYFILE. ------------------------------------------------------------ revno: 102339 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 20:05:15 -0800 message: * lisp/gnus/nnir.el (gnus-group-topic-name): Autoload. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-11 03:50:27 +0000 +++ lisp/gnus/ChangeLog 2010-11-11 04:05:15 +0000 @@ -1,3 +1,7 @@ +2010-11-11 Glenn Morris + + * nnir.el (gnus-group-topic-name): Autoload. + 2010-11-11 Katsumi Yamaoka * shr.el (shr-insert): Don't break long line if it is because of @@ -17988,7 +17992,8 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-11-11 02:10:07 +0000 +++ lisp/gnus/nnir.el 2010-11-11 04:05:15 +0000 @@ -1371,6 +1371,8 @@ (cons sym (format (cdr mapping) result))) (cons sym (read-string prompt))))) +(autoload 'gnus-group-topic-name "gnus-topic") + (defun nnir-run-query (query nserver) "Invoke appropriate search engine function (see `nnir-engines'). If some groups were process-marked, run the query for each of the groups ------------------------------------------------------------ revno: 102338 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-11-11 04:01:12 +0000 message: shr.el (shr-insert): Fix last change. diff: === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-11-11 03:50:27 +0000 +++ lisp/gnus/shr.el 2010-11-11 04:01:12 +0000 @@ -240,11 +240,10 @@ (progn (setq found (shr-find-fill-point)) (not (eolp)))) - (unless (prog1 - found - (when (eq (preceding-char) ? ) - (delete-char -1)) - (insert "\n")) + (when (eq (preceding-char) ? ) + (delete-char -1)) + (insert "\n") + (unless found (put-text-property (1- (point)) (point) 'shr-break t) ;; No space is needed at the beginning of a line. (when (eq (following-char) ? ) ------------------------------------------------------------ revno: 102337 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 19:59:04 -0800 message: Minor ls-lisp changes. * lisp/ls-lisp.el (ls-lisp-ignore-case, ls-lisp-dirs-first) (ls-lisp-verbosity): Add custom :set-after property. (ls-lisp-verbosity, ls-lisp-use-localized-time-format): Doc fixes. (ls-lisp-format, ls-lisp-format-time): Don't take `now' as an argument. (ls-lisp-insert-directory): Update caller. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-11 03:57:02 +0000 +++ lisp/ChangeLog 2010-11-11 03:59:04 +0000 @@ -2,6 +2,12 @@ * obsolete/lucid.el: Don't warn about any CL functions in this file. + * ls-lisp.el (ls-lisp-ignore-case, ls-lisp-dirs-first) + (ls-lisp-verbosity): Add custom :set-after property. + (ls-lisp-verbosity, ls-lisp-use-localized-time-format): Doc fixes. + (ls-lisp-format, ls-lisp-format-time): Don't take `now' as an argument. + (ls-lisp-insert-directory): Update caller. + * play/landmark.el (lm-prompt-for-move): * play/gomoku.el (gomoku-prompt-for-move): Remove nonsensical code. === modified file 'lisp/ls-lisp.el' --- lisp/ls-lisp.el 2010-11-10 04:28:16 +0000 +++ lisp/ls-lisp.el 2010-11-11 03:59:04 +0000 @@ -92,6 +92,7 @@ (or (memq ls-lisp-emulation '(MS-Windows MacOS)) (and (boundp 'ls-lisp-dired-ignore-case) ls-lisp-dired-ignore-case)) "Non-nil causes ls-lisp alphabetic sorting to ignore case." + :set-after '(ls-lisp-emulation) :type 'boolean :group 'ls-lisp) @@ -99,6 +100,7 @@ "Non-nil causes ls-lisp to sort directories first in any ordering. \(Or last if it is reversed.) Follows Microsoft Windows Explorer." ;; Functionality suggested by Chris McMahan + :set-after '(ls-lisp-emulation) :type 'boolean :group 'ls-lisp) @@ -114,14 +116,15 @@ A value of nil (or an empty list) means display none of them. Concepts come from UNIX: `links' means count of names associated with -the file\; `uid' means user (owner) identifier\; `gid' means group +the file; `uid' means user (owner) identifier; `gid' means group identifier. -If emulation is MacOS then default is nil\; +If emulation is MacOS then default is nil; if emulation is MS-Windows then default is `(links)' if platform is -Windows NT/2K, nil otherwise\; -if emulation is UNIX then default is `(links uid)'\; +Windows NT/2K, nil otherwise; +if emulation is UNIX then default is `(links uid)'; if emulation is GNU then default is `(links uid gid)'." + :set-after '(ls-lisp-emulation) ;; Functionality suggested by Howard Melman :type '(set (const :tag "Show Link Count" links) (const :tag "Show User" uid) @@ -157,7 +160,7 @@ Syntax: (EARLY-TIME-FORMAT OLD-TIME-FORMAT) The EARLY-TIME-FORMAT is used if file has been modified within the -current year. The OLD-TIME-FORMAT is used for older files. To use ISO +current year. The OLD-TIME-FORMAT is used for older files. To use ISO 8601 dates, you could set: \(setq ls-lisp-format-time-list @@ -168,11 +171,11 @@ :group 'ls-lisp) (defcustom ls-lisp-use-localized-time-format nil - "Non-nil causes ls-lisp to use `ls-lisp-format-time-list' even if -a valid locale is specified. + "Non-nil means to always use `ls-lisp-format-time-list' for time stamps. +This applies even if a valid locale is specified. WARNING: Using localized date/time format might cause Dired columns -to fail to lign up, e.g. if month names are not all of the same length." +to fail to line up, e.g. if month names are not all of the same length." :type 'boolean :group 'ls-lisp) @@ -302,7 +305,6 @@ (if (memq ?n switches) 'integer 'string))) - (now (current-time)) (sum 0) (max-uid-len 0) (max-gid-len 0) @@ -373,7 +375,7 @@ sum (float sum)))) (insert (ls-lisp-format short attr file-size - switches time-index now)))) + switches time-index)))) ;; Insert total size of all files: (save-excursion (goto-char (car total-line)) @@ -412,7 +414,7 @@ (ls-lisp-classify-file file fattr) file) fattr (nth 7 fattr) - switches time-index (current-time))) + switches time-index)) (message "%s: doesn't exist or is inaccessible" file) (ding) (sit-for 2))))) ; to show user the message! @@ -585,10 +587,10 @@ (substring filename (1+ i) end)))) )) "\0" filename)) -(defun ls-lisp-format (file-name file-attr file-size switches time-index now) +(defun ls-lisp-format (file-name file-attr file-size switches time-index) "Format one line of long ls output for file FILE-NAME. FILE-ATTR and FILE-SIZE give the file's attributes and size. -SWITCHES, TIME-INDEX and NOW give the full switch list and time data." +SWITCHES and TIME-INDEX give the full switch list and time data." (let ((file-type (nth 0 file-attr)) ;; t for directory, string (name linked to) ;; for symbolic link, or nil. @@ -646,7 +648,7 @@ gid)))) (ls-lisp-format-file-size file-size (memq ?h switches)) " " - (ls-lisp-format-time file-attr time-index now) + (ls-lisp-format-time file-attr time-index) " " (if (not (memq ?F switches)) ; ls-lisp-classify already did that (propertize file-name 'dired-filename t) @@ -664,14 +666,13 @@ ((memq ?t switches) 5) ; last modtime ((memq ?u switches) 4))) ; last access -(defun ls-lisp-format-time (file-attr time-index now) +(defun ls-lisp-format-time (file-attr time-index) "Format time for file with attributes FILE-ATTR according to TIME-INDEX. Use the same method as ls to decide whether to show time-of-day or year, -depending on distance between file date and NOW. +depending on distance between file date and the current time. All ls time options, namely c, t and u, are handled." (let* ((time (nth (or time-index 5) file-attr)) ; default is last modtime - (diff (- (float-time time) - (float-time now))) + (diff (- (float-time time) (float-time))) ;; Consider a time to be recent if it is within the past six ;; months. A Gregorian year has 365.2425 * 24 * 60 * 60 == ;; 31556952 seconds on the average, and half of that is 15778476. ------------------------------------------------------------ revno: 102336 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 19:57:02 -0800 message: Remove odd code from kandmark, gomoku. * lisp/play/landmark.el (lm-prompt-for-move): * lisp/play/gomoku.el (gomoku-prompt-for-move): Remove nonsensical code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-11 03:54:59 +0000 +++ lisp/ChangeLog 2010-11-11 03:57:02 +0000 @@ -2,6 +2,9 @@ * obsolete/lucid.el: Don't warn about any CL functions in this file. + * play/landmark.el (lm-prompt-for-move): + * play/gomoku.el (gomoku-prompt-for-move): Remove nonsensical code. + * progmodes/idlw-complete-structtag.el: Remove unused dec `name'. * progmodes/idlwave.el (idlwave-routine-entry-compare-twins) === modified file 'lisp/play/gomoku.el' --- lisp/play/gomoku.el 2010-11-03 03:33:24 +0000 +++ lisp/play/gomoku.el 2010-11-11 03:57:02 +0000 @@ -929,11 +929,7 @@ "Display a message asking for Human's move." (message (if (zerop gomoku-number-of-human-moves) "Your move? (Move to a free square and hit X, RET ...)" - "Your move?")) - ;; This may seem silly, but if one omits the following line (or a similar - ;; one), the cursor may very well go to some place where POINT is not. - ;; FIXME: this can't be right!! --Stef - (save-excursion (set-buffer (other-buffer)))) + "Your move?"))) (defun gomoku-prompt-for-other-game () "Ask for another game, and start it." === modified file 'lisp/play/landmark.el' --- lisp/play/landmark.el 2010-11-03 03:35:38 +0000 +++ lisp/play/landmark.el 2010-11-11 03:57:02 +0000 @@ -826,11 +826,7 @@ "Display a message asking for Human's move." (message (if (zerop lm-number-of-human-moves) "Your move? (move to a free square and hit X, RET ...)" - "Your move?")) - ;; This may seem silly, but if one omits the following line (or a similar - ;; one), the cursor may very well go to some place where POINT is not. - ;; FIXME: this can't be right!! --Stef - (save-excursion (set-buffer (other-buffer)))) + "Your move?"))) (defun lm-prompt-for-other-game () "Ask for another game, and start it." ------------------------------------------------------------ revno: 102335 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 19:54:59 -0800 message: * lisp/obsolete/lucid.el: Don't warn about any CL functions in this file. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-11 03:53:16 +0000 +++ lisp/ChangeLog 2010-11-11 03:54:59 +0000 @@ -1,5 +1,7 @@ 2010-11-11 Glenn Morris + * obsolete/lucid.el: Don't warn about any CL functions in this file. + * progmodes/idlw-complete-structtag.el: Remove unused dec `name'. * progmodes/idlwave.el (idlwave-routine-entry-compare-twins) === modified file 'lisp/obsolete/lucid.el' --- lisp/obsolete/lucid.el 2010-10-02 02:46:13 +0000 +++ lisp/obsolete/lucid.el 2010-11-11 03:54:59 +0000 @@ -234,5 +234,8 @@ (provide 'lucid) -;; arch-tag: 80f9ab46-0b36-4151-86ed-3edb6d449c9e +;; Local Variables: +;; byte-compile-warnings: (not cl-functions) +;; End: + ;;; lucid.el ends here ------------------------------------------------------------ revno: 102334 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 19:53:16 -0800 message: Silence idlw*.el compilation. * lisp/progmodes/idlw-complete-structtag.el: Remove unused dec `name'. * lisp/progmodes/idlwave.el (idlwave-routine-entry-compare-twins) (idlwave-study-twins): Prefix dynamic local variable `name'. (idlwave-routine-twin-compare): Update for above change. * lisp/progmodes/idlw-help.el (idlwave-do-mouse-completion-help): Prefix dynamic local variables `name', `kwd', and `link'. * lisp/progmodes/idlw-shell.el (idlwave-shell-complete-execcomm-help): * lisp/progmodes/idlw-complete-structtag.el (idlwave-complete-structure-tag-help): * lisp/progmodes/idlwave.el (idlwave-complete-sysvar-help) (idlwave-complete-sysvar-tag-help) (idlwave-complete-class-structure-tag-help): Update for above name changes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 22:27:02 +0000 +++ lisp/ChangeLog 2010-11-11 03:53:16 +0000 @@ -1,3 +1,21 @@ +2010-11-11 Glenn Morris + + * progmodes/idlw-complete-structtag.el: Remove unused dec `name'. + + * progmodes/idlwave.el (idlwave-routine-entry-compare-twins) + (idlwave-study-twins): Prefix dynamic local variable `name'. + (idlwave-routine-twin-compare): Update for above change. + + * progmodes/idlw-help.el (idlwave-do-mouse-completion-help): + Prefix dynamic local variables `name', `kwd', and `link'. + * progmodes/idlw-shell.el (idlwave-shell-complete-execcomm-help): + * progmodes/idlw-complete-structtag.el + (idlwave-complete-structure-tag-help): + * progmodes/idlwave.el (idlwave-complete-sysvar-help) + (idlwave-complete-sysvar-tag-help) + (idlwave-complete-class-structure-tag-help): + Update for above name changes. + 2010-11-10 Lars Magne Ingebrigtsen * net/browse-url.el (browse-url-browser-function): Change the === modified file 'lisp/progmodes/idlw-complete-structtag.el' --- lisp/progmodes/idlw-complete-structtag.el 2010-08-29 20:10:43 +0000 +++ lisp/progmodes/idlw-complete-structtag.el 2010-11-11 03:53:16 +0000 @@ -1,7 +1,7 @@ ;;; idlw-complete-structtag.el --- Completion of structure tags. -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Maintainer: J.D. Smith @@ -225,9 +225,8 @@ ;; Fake help in the source buffer for structure tags. -;; kwd and name are global-variables here. -(defvar name) -(defvar kwd) +;; idlw-help-kwd is a global-variable (from idlwave-do-mouse-completion-help). +(defvar idlw-help-kwd) (defvar idlwave-help-do-struct-tag) (defun idlwave-complete-structure-tag-help (mode word) (cond @@ -236,13 +235,10 @@ (not (equal idlwave-current-tags-buffer (get-buffer (idlwave-shell-buffer))))) ((eq mode 'set) - (setq kwd word + (setq idlw-help-kwd word idlwave-help-do-struct-tag idlwave-structtag-struct-location)) (t (error "This should not happen")))) (provide 'idlw-complete-structtag) ;;; idlw-complete-structtag.el ends here - - -;; arch-tag: d1f9e55c-e504-4187-9c31-3c3651fa4bfa === modified file 'lisp/progmodes/idlw-help.el' --- lisp/progmodes/idlw-help.el 2010-08-29 20:10:43 +0000 +++ lisp/progmodes/idlw-help.el 2010-11-11 03:53:16 +0000 @@ -1,7 +1,7 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE -;; 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. ;; ;; Authors: J.D. Smith ;; Carsten Dominik @@ -576,13 +576,13 @@ (let* ((cw (selected-window)) (info idlwave-completion-help-info) ; global passed in (what (nth 0 info)) - (name (nth 1 info)) + (idlw-help-name (nth 1 info)) (type (nth 2 info)) (class (nth 3 info)) (need-class class) - (kwd (nth 4 info)) + (idlw-help-kwd (nth 4 info)) (sclasses (nth 5 info)) - word link) + word idlw-help-link) (mouse-set-point ev) @@ -590,18 +590,18 @@ (setq word (idlwave-this-word)) (if (string= word "") (error "No help item selected")) - (setq link (get-text-property 0 'link word)) + (setq idlw-help-link (get-text-property 0 'link word)) (select-window cw) (cond ;; Routine name ((memq what '(procedure function routine)) - (setq name word) + (setq idlw-help-name word) (if (or (eq class t) (and (stringp class) sclasses)) (let* ((classes (idlwave-all-method-classes - (idlwave-sintern-method name) + (idlwave-sintern-method idlw-help-name) type))) - (setq link t) ; No specific link valid yet + (setq idlw-help-link t) ; No specific link valid yet (if sclasses (setq classes (idlwave-members-only classes (cons class sclasses)))) @@ -611,19 +611,19 @@ ;; XXX is this necessary, given all-method-classes? (if (stringp class) (setq class (idlwave-find-inherited-class - (idlwave-sintern-routine-or-method name class) + (idlwave-sintern-routine-or-method idlw-help-name class) type (idlwave-sintern-class class))))) ;; Keyword ((eq what 'keyword) - (setq kwd word) + (setq idlw-help-kwd word) (if (or (eq class t) (and (stringp class) sclasses)) (let ((classes (idlwave-all-method-keyword-classes - (idlwave-sintern-method name) - (idlwave-sintern-keyword kwd) + (idlwave-sintern-method idlw-help-name) + (idlwave-sintern-keyword idlw-help-kwd) type))) - (setq link t) ; Link can't be correct yet + (setq idlw-help-link t) ; Link can't be correct yet (if sclasses (setq classes (idlwave-members-only classes (cons class sclasses)))) @@ -632,11 +632,12 @@ ;; XXX is this necessary, given all-method-keyword-classes? (if (stringp class) (setq class (idlwave-find-inherited-class - (idlwave-sintern-routine-or-method name class) + (idlwave-sintern-routine-or-method + idlw-help-name class) type (idlwave-sintern-class class))))) - (if (string= (downcase name) "obj_new") + (if (string= (downcase idlw-help-name) "obj_new") (setq class idlwave-current-obj_new-class - name "Init")))) + idlw-help-name "Init")))) ;; Class name ((eq what 'class) @@ -649,9 +650,11 @@ (funcall what 'set word)) (t (error "Cannot help with this item"))) - (if (and need-class (not class) (not (and link (not (eq link t))))) + (if (and need-class (not class) + (not (and idlw-help-link (not (eq idlw-help-link t))))) (error "Cannot help with this item")) - (idlwave-online-help link (or name word) type class kwd))) + (idlwave-online-help idlw-help-link (or idlw-help-name word) + type class idlw-help-kwd))) (defvar idlwave-highlight-help-links-in-completion) (defvar idlwave-completion-help-links) @@ -1383,5 +1386,4 @@ (provide 'idlw-help) (provide 'idlwave-help) -;; arch-tag: d27b5505-59de-497f-ba3f-f199fd4fb911 ;;; idlw-help.el ends here === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2010-11-09 05:33:07 +0000 +++ lisp/progmodes/idlw-shell.el 2010-11-11 03:53:16 +0000 @@ -2180,8 +2180,8 @@ ;; Default completion of modules and keywords (idlwave-complete arg))))) -;; Get rid of opaque dynamic variable passing of link? -(defvar link) ;dynamic variable +;; Get rid of opaque dynamic variable passing of idlw-help-link? +(defvar idlw-help-link) ; dynamic variable from idlwave-do-mouse-completion-help (defun idlwave-shell-complete-execcomm-help (mode word) (let ((word (or (nth 1 idlwave-completion-help-info) word)) (entry (assoc-string word idlwave-executive-commands-alist t))) @@ -2189,7 +2189,7 @@ ((eq mode 'test) (and (stringp word) entry (cdr entry))) ((eq mode 'set) - (if entry (setq link (cdr entry)))) ;; setting dynamic variable!!! + (if entry (setq idlw-help-link (cdr entry)))) ; setting dynamic variable! (t (error "This should not happen"))))) (defun idlwave-shell-complete-filename (&optional arg) === modified file 'lisp/progmodes/idlwave.el' --- lisp/progmodes/idlwave.el 2010-11-09 05:33:07 +0000 +++ lisp/progmodes/idlwave.el 2010-11-11 03:53:16 +0000 @@ -7659,7 +7659,7 @@ t)) ; return t to skip other completions (t nil)))) -(defvar link) ;dynamic variables set by help callback +(defvar idlw-help-link) ;dynamic variables set by help callback (defun idlwave-complete-sysvar-help (mode word) (let ((word (or (nth 1 idlwave-completion-help-info) word)) (entry (assoc word idlwave-system-variables-alist))) @@ -7667,7 +7667,8 @@ ((eq mode 'test) (and (stringp word) entry (nth 1 (assq 'link entry)))) ((eq mode 'set) - (if entry (setq link (nth 1 (assq 'link entry))))) ;; setting dynamic!!! + ;; Setting dynamic!!! + (if entry (setq idlw-help-link (nth 1 (assq 'link entry))))) (t (error "This should not happen"))))) (defun idlwave-complete-sysvar-tag-help (mode word) @@ -7681,10 +7682,10 @@ (and (stringp word) entry main)) ((eq mode 'set) (if entry - (setq link + (setq idlw-help-link (if (setq target (cdr (assoc-string word tags t))) - (idlwave-substitute-link-target main target) - main)))) ;; setting dynamic!!! + (idlwave-substitute-link-target main target) + main)))) ;; setting dynamic!!! (t (error "This should not happen"))))) (defun idlwave-split-link-target (link) @@ -7704,9 +7705,10 @@ link))) ;; Fake help in the source buffer for class structure tags. -;; KWD AND NAME ARE GLOBAL-VARIABLES HERE. -(defvar name) -(defvar kwd) +;; IDLW-HELP-LINK AND IDLW-HELP-NAME ARE GLOBAL-VARIABLES HERE. +;; (from idlwave-do-mouse-completion-help) +(defvar idlw-help-name) +(defvar idlw-help-link) (defvar idlwave-help-do-class-struct-tag nil) (defun idlwave-complete-class-structure-tag-help (mode word) (cond @@ -7722,9 +7724,9 @@ idlwave-system-class-info) (error "No help available for system class tags")) (if (setq found-in (idlwave-class-found-in class-with)) - (setq name (cons (concat found-in "__define") class-with)) - (setq name (concat class-with "__define"))))) - (setq kwd word + (setq idlw-help-name (cons (concat found-in "__define") class-with)) + (setq idlw-help-name (concat class-with "__define"))))) + (setq idlw-help-link word idlwave-help-do-class-struct-tag t)) (t (error "This should not happen")))) @@ -8802,7 +8804,7 @@ non-dangerous because many IDL routines are implemented as library routines, and may have been scanned." (let* ((entry (car entries)) - (name (car entry)) ; + (idlwave-twin-name (car entry)) ; (type (nth 1 entry)) ; Must be bound for (idlwave-twin-class (nth 2 entry)) ; idlwave-routine-twin-compare (cnt 0) @@ -8878,7 +8880,7 @@ (defun idlwave-routine-entry-compare-twins (a b) "Compare two routine entries, under the assumption that they are twins. This basically calls `idlwave-routine-twin-compare' with the correct args." - (let* ((name (car a)) + (let* ((idlwave-twin-name (car a)) (type (nth 1 a)) (idlwave-twin-class (nth 2 a)) ; used in idlwave-routine-twin-compare (asrc (nth 3 a)) @@ -8897,6 +8899,7 @@ ;; Bound in idlwave-study-twins,idlwave-routine-entry-compare-twins. (defvar idlwave-twin-class) +(defvar idlwave-twin-name) (defun idlwave-routine-twin-compare (a b) "Compare two routine twin entries for sorting. @@ -8937,8 +8940,8 @@ (fname-re (if idlwave-twin-class (format "\\`%s__\\(%s\\|define\\)\\.pro\\'" (regexp-quote (downcase idlwave-twin-class)) - (regexp-quote (downcase name))) - (format "\\`%s\\.pro" (regexp-quote (downcase name))))) + (regexp-quote (downcase idlwave-twin-name))) + (format "\\`%s\\.pro" (regexp-quote (downcase idlwave-twin-name))))) ;; Is file name derived from the routine name? ;; Method file or class definition file? (anamep (string-match fname-re aname)) ------------------------------------------------------------ revno: 102333 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-11-11 03:50:27 +0000 message: shr.el (shr-insert): Don't break long line if it is because of kinsoku-bol characters in the line end. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-11 02:11:30 +0000 +++ lisp/gnus/ChangeLog 2010-11-11 03:50:27 +0000 @@ -1,3 +1,8 @@ +2010-11-11 Katsumi Yamaoka + + * shr.el (shr-insert): Don't break long line if it is because of + kinsoku-bol characters in the line end. + 2010-11-11 Andrew Cohen * nnir.el (nnir-request-move-article): Fix to provide original group === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-11-09 22:17:36 +0000 +++ lisp/gnus/shr.el 2010-11-11 03:50:27 +0000 @@ -235,20 +235,24 @@ (aref elem 0))))) (delete-char -1))) (insert elem) - (while (> (current-column) shr-width) - (unless (prog1 - (shr-find-fill-point) - (when (eq (preceding-char) ? ) - (delete-char -1)) - (insert "\n")) - (put-text-property (1- (point)) (point) 'shr-break t) - ;; No space is needed at the beginning of a line. - (when (eq (following-char) ? ) - (delete-char 1))) - (when (> shr-indentation 0) - (shr-indent)) - (end-of-line)) - (insert " ")) + (let (found) + (while (and (> (current-column) shr-width) + (progn + (setq found (shr-find-fill-point)) + (not (eolp)))) + (unless (prog1 + found + (when (eq (preceding-char) ? ) + (delete-char -1)) + (insert "\n")) + (put-text-property (1- (point)) (point) 'shr-break t) + ;; No space is needed at the beginning of a line. + (when (eq (following-char) ? ) + (delete-char 1))) + (when (> shr-indentation 0) + (shr-indent)) + (end-of-line)) + (insert " "))) (unless (string-match "[ \t\n]\\'" text) (delete-char -1))))) ------------------------------------------------------------ revno: 102332 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 19:50:20 -0800 message: * lisp/erc/erc-lang.el (erc-cmd-LANG): Fix what may have been a typo. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2010-11-05 14:17:46 +0000 +++ lisp/erc/ChangeLog 2010-11-11 03:50:20 +0000 @@ -1,3 +1,7 @@ +2010-11-11 Glenn Morris + + * erc-lang.el (erc-cmd-LANG): Fix what may have been a typo. + 2010-11-05 Lars Magne Ingebrigtsen * erc-backend.el (erc-coding-system-precedence): New variable. === modified file 'lisp/erc/erc-lang.el' --- lisp/erc/erc-lang.el 2010-01-13 08:35:10 +0000 +++ lisp/erc/erc-lang.el 2010-11-11 03:50:20 +0000 @@ -1,6 +1,7 @@ ;;; erc-lang.el --- provide the LANG command to ERC -;; Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Alex Schroeder ;; Maintainer: Alex Schroeder @@ -197,17 +198,14 @@ iso-638-languages))) (message "%s" (cdr (assoc code iso-638-languages)))) -(defvar line) ; dynamically bound in erc-process-input-line - (defun erc-cmd-LANG (language) "Display the language name for the language code given by LANGUAGE." (let ((lang (cdr (assoc language iso-638-languages)))) (erc-display-message nil 'notice 'active - (or lang (concat line ": No such domain")))) + (or lang (concat language ": No such domain")))) t) (provide 'erc-lang) -;; arch-tag: 8ffb1563-cc03-4517-b067-16309d4ff97b ;;; erc-lang.el ends here ------------------------------------------------------------ revno: 102331 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-11-11 02:11:30 +0000 message: lisp/gnus/ChangeLog: Cosmetic fix. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-11 02:10:07 +0000 +++ lisp/gnus/ChangeLog 2010-11-11 02:11:30 +0000 @@ -1,11 +1,11 @@ 2010-11-11 Andrew Cohen - * nnir.el (nnir-request-move-article): fix to provide original group + * nnir.el (nnir-request-move-article): Fix to provide original group and subject. - (nnir-warp-to-article): don't fail on articles whose headers haven't + (nnir-warp-to-article): Don't fail on articles whose headers haven't been retrieved. - * gnus-sum.el (gnus-summary-move-article): use original group and + * gnus-sum.el (gnus-summary-move-article): Use original group and subject for virtual articles such as those in an nnir summary buffer. 2010-11-11 Katsumi Yamaoka ------------------------------------------------------------ revno: 102330 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-11-11 02:10:07 +0000 message: nnir.el (nnir-request-move-article): fix to provide original group and subject. nnir.el (nnir-warp-to-article): don't fail on articles whose headers haven't been retrieved. gnus-sum.el (gnus-summary-move-article): use original group and subject for virtual articles such as those in an nnir summary buffer. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-11 01:45:05 +0000 +++ lisp/gnus/ChangeLog 2010-11-11 02:10:07 +0000 @@ -1,3 +1,13 @@ +2010-11-11 Andrew Cohen + + * nnir.el (nnir-request-move-article): fix to provide original group + and subject. + (nnir-warp-to-article): don't fail on articles whose headers haven't + been retrieved. + + * gnus-sum.el (gnus-summary-move-article): use original group and + subject for virtual articles such as those in an nnir summary buffer. + 2010-11-11 Katsumi Yamaoka * gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-11-09 22:17:36 +0000 +++ lisp/gnus/gnus-sum.el 2010-11-11 02:10:07 +0000 @@ -1310,6 +1310,7 @@ (defvar gnus-article-decoded-p nil) (defvar gnus-article-charset nil) (defvar gnus-article-ignored-charsets nil) +(defvar gnus-article-original-subject nil) (defvar gnus-scores-exclude-files nil) (defvar gnus-page-broken nil) @@ -1335,6 +1336,7 @@ (defvar gnus-current-copy-group nil) (defvar gnus-current-crosspost-group nil) (defvar gnus-newsgroup-display nil) +(defvar gnus-newsgroup-original-name nil) (defvar gnus-newsgroup-dependencies nil) (defvar gnus-newsgroup-adaptive nil) @@ -9703,6 +9705,10 @@ articles) (while articles (setq article (pop articles)) + (let ((gnus-newsgroup-original-name gnus-newsgroup-name) + (gnus-article-original-subject + (mail-header-subject + (gnus-data-header (assoc article (gnus-data-list nil)))))) (setq art-group (cond @@ -9781,7 +9787,7 @@ action (gnus-data-header (assoc article (gnus-data-list nil))) - gnus-newsgroup-name nil + gnus-newsgroup-original-name nil select-method))) (t (let* ((pto-group (gnus-group-prefixed-name @@ -9877,13 +9883,16 @@ article gnus-newsgroup-name (current-buffer) t))) ;; run the move/copy/crosspost/respool hook + (let ((header (gnus-data-header + (assoc article (gnus-data-list nil))))) + (mail-header-set-subject header gnus-article-original-subject) (run-hook-with-args 'gnus-summary-article-move-hook action (gnus-data-header (assoc article (gnus-data-list nil))) - gnus-newsgroup-name + gnus-newsgroup-original-name to-newsgroup - select-method)) + select-method))) ;;;!!!Why is this necessary? (set-buffer gnus-summary-buffer) @@ -9903,7 +9912,7 @@ (gnus-kill-buffer copy-buf) (gnus-summary-position-point) - (gnus-set-mode-line 'summary))) + (gnus-set-mode-line 'summary)))) (defun gnus-summary-copy-article (&optional n to-newsgroup select-method) "Copy the current article to some other group. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-11-07 00:22:06 +0000 +++ lisp/gnus/nnir.el 2010-11-11 02:10:07 +0000 @@ -548,8 +548,6 @@ ;; in nnir group (when novitem (mail-header-set-number novitem art) - (mail-header-set-from novitem - (mail-header-from novitem)) (mail-header-set-subject novitem (format "[%d: %s/%d] %s" @@ -595,7 +593,13 @@ (to-newsgroup (nth 1 accept-form)) (to-method (gnus-find-method-for-group to-newsgroup)) (from-method (gnus-find-method-for-group artfullgroup)) - (move-is-internal (gnus-server-equal from-method to-method))) + (move-is-internal (gnus-server-equal from-method to-method)) + (artsubject (mail-header-subject + (gnus-data-header + (assoc article (gnus-data-list nil)))))) + (setq gnus-newsgroup-original-name artfullgroup) + (string-match "^\\[[0-9]+:.+/[0-9]+\\] " artsubject) + (setq gnus-article-original-subject (substring artsubject (match-end 0))) (gnus-request-move-article artno artfullgroup @@ -604,11 +608,12 @@ last (and move-is-internal to-newsgroup ; Not respooling - (gnus-group-real-name to-newsgroup))) ; Is this move internal - )) + (gnus-group-real-name to-newsgroup))))) (deffoo nnir-warp-to-article () - (let* ((cur (gnus-summary-article-number)) + (let* ((cur (if (> (gnus-summary-article-number) 0) + (gnus-summary-article-number) + (error "This is not a real article."))) (gnus-newsgroup-name (nnir-artlist-artitem-group nnir-artlist cur)) (backend-number (nnir-artlist-artitem-number nnir-artlist cur))) (gnus-summary-read-group-1 gnus-newsgroup-name t t gnus-summary-buffer @@ -1475,7 +1480,7 @@ (let ((server (gnus-group-server var))) (if (assoc server value) (nconc (cdr (assoc server value)) (list var)) - (push (cons (gnus-group-server var) (list var)) value)))) + (push (cons server (list var)) value)))) value) nil)) ------------------------------------------------------------ revno: 102329 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-11-11 01:45:05 +0000 message: gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at least 21.5). smime.el (from): Declare it again for XEmacs. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-10 23:57:24 +0000 +++ lisp/gnus/ChangeLog 2010-11-11 01:45:05 +0000 @@ -1,3 +1,10 @@ +2010-11-11 Katsumi Yamaoka + + * gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at + least 21.5). + + * smime.el (from): Declare it again for XEmacs. + 2010-11-10 Lars Magne Ingebrigtsen * message.el (message-resend): Don't disable encoding unless it's === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-11-10 06:23:53 +0000 +++ lisp/gnus/gnus-art.el 2010-11-11 01:45:05 +0000 @@ -2120,7 +2120,7 @@ "Translate many Unicode characters into their ASCII equivalents." (interactive) (require 'org-entities) - (let ((table (make-char-table nil))) + (let ((table (make-char-table (if (featurep 'xemacs) 'generic)))) (dolist (elem org-entities) (when (and (listp elem) (= (length (nth 6 elem)) 1)) @@ -2132,7 +2132,9 @@ (let ((inhibit-read-only t) replace) (while (not (eobp)) - (if (not (setq replace (aref table (following-char)))) + (if (not (setq replace (if (featurep 'xemacs) + (get-char-table (following-char) table) + (aref table (following-char))))) (forward-char 1) (delete-char 1) (insert replace)))))))) === modified file 'lisp/gnus/smime.el' --- lisp/gnus/smime.el 2010-11-10 04:09:49 +0000 +++ lisp/gnus/smime.el 2010-11-11 01:45:05 +0000 @@ -426,6 +426,8 @@ (insert-buffer-substring smime-details-buffer) nil)) +(defvar from) ;; Necessary for XEmacs to silence the byte compiler. + (defun smime-decrypt-region (b e keyfile) "Decrypt S/MIME message in region between B and E with key in KEYFILE. On success, replaces region with decrypted data and return non-nil. ------------------------------------------------------------ revno: 102328 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-11-10 23:57:24 +0000 message: lisp/gnus/ChangeLog (2010-11-10): Fix wording. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-10 23:16:01 +0000 +++ lisp/gnus/ChangeLog 2010-11-10 23:57:24 +0000 @@ -25,7 +25,7 @@ 2010-11-10 Katsumi Yamaoka - * gnus-art.el (org-entities): Bind it. + * gnus-art.el (org-entities): Declare it to silence the byte compiler. 2010-11-09 Lars Magne Ingebrigtsen ------------------------------------------------------------ revno: 102327 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-11-10 23:16:01 +0000 message: nnimap.el (nnimap-update-info): Fix problem with `g' chopping of low-numbered articles. message.el (message-resend): Don't disable encoding unless it's already encoded. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-10 07:55:25 +0000 +++ lisp/gnus/ChangeLog 2010-11-10 23:16:01 +0000 @@ -1,3 +1,11 @@ +2010-11-10 Lars Magne Ingebrigtsen + + * message.el (message-resend): Don't disable encoding unless it's + already encoded. + + * nnimap.el (nnimap-update-info): Fix problem with `g' chopping of + low-numbered articles. + 2010-11-10 Katsumi Yamaoka * rfc2047.el (rfc2047-syntax-table): Simplify. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2010-11-09 22:17:36 +0000 +++ lisp/gnus/message.el 2010-11-10 23:16:01 +0000 @@ -7432,7 +7432,11 @@ (when (looking-at "From ") (replace-match "X-From-Line: ")) ;; Send it. - (let ((message-inhibit-body-encoding t) + (let ((message-inhibit-body-encoding + ;; Don't do any further encoding if it looks like the + ;; message has already been encoded. + (let ((case-fold-search t)) + (re-search-forward "^mime-version:" nil t))) (message-inhibit-ecomplete t) message-required-mail-headers message-generate-hashcash === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-11-07 00:22:06 +0000 +++ lisp/gnus/nnimap.el 2010-11-10 23:16:01 +0000 @@ -1155,13 +1155,16 @@ (not (gnus-active group))) (gnus-set-active group (cond + (active + (cons (min (or low (car active)) + (car active)) + (max (or high (cdr active)) + (cdr active)))) ((and low high) (cons low high)) (uidnext ;; No articles in this group. (cons uidnext (1- uidnext))) - (active - active) (start-article (cons start-article (1- start-article))) (t ------------------------------------------------------------ revno: 102326 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2010-11-10 23:27:02 +0100 message: * net/browse-url.el (browse-url-browser-function): Change the default to use `browse-url-mail' on mailto: URLs. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 21:35:06 +0000 +++ lisp/ChangeLog 2010-11-10 22:27:02 +0000 @@ -1,3 +1,8 @@ +2010-11-10 Lars Magne Ingebrigtsen + + * net/browse-url.el (browse-url-browser-function): Change the + default to use `browse-url-mail' on mailto: URLs. + 2010-11-10 Chong Yidong * emacs-lisp/package.el (package-read-all-archive-contents): Reset === modified file 'lisp/net/browse-url.el' --- lisp/net/browse-url.el 2010-11-10 00:02:44 +0000 +++ lisp/net/browse-url.el 2010-11-10 22:27:02 +0000 @@ -216,11 +216,13 @@ ;;;###autoload (defcustom browse-url-browser-function - (cond - ((memq system-type '(windows-nt ms-dos cygwin)) - 'browse-url-default-windows-browser) - ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) - (t 'browse-url-default-browser)) + `(("\\`mailto:" . browse-url-mail) + ("." . + ,(cond + ((memq system-type '(windows-nt ms-dos cygwin)) + 'browse-url-default-windows-browser) + ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) + (t 'browse-url-default-browser)))) "Function to display the current buffer in a WWW browser. This is used by the `browse-url-at-point', `browse-url-at-mouse', and `browse-url-of-file' commands. @@ -260,7 +262,7 @@ (function :tag "Your own function") (alist :tag "Regexp/function association list" :key-type regexp :value-type function)) - :version "21.1" + :version "24.1" :group 'browse-url) (defcustom browse-url-netscape-program "netscape" ------------------------------------------------------------ revno: 102325 committer: Chong Yidong branch nick: trunk timestamp: Wed 2010-11-10 16:35:06 -0500 message: Minor fix to package-archive-contents recalculation. lisp/emacs-lisp/package.el (package-read-all-archive-contents): Reset package-archive-contents to nil before re-reading. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 17:25:13 +0000 +++ lisp/ChangeLog 2010-11-10 21:35:06 +0000 @@ -1,3 +1,8 @@ +2010-11-10 Chong Yidong + + * emacs-lisp/package.el (package-read-all-archive-contents): Reset + package-archive-contents to nil before re-reading. + 2010-11-10 Brandon Craig Rhodes * textmodes/flyspell.el (flyspell-word): Do not re-check words === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2010-11-03 23:21:51 +0000 +++ lisp/emacs-lisp/package.el 2010-11-10 21:35:06 +0000 @@ -753,6 +753,7 @@ (defun package-read-all-archive-contents () "Re-read `archive-contents', if it exists. If successful, set `package-archive-contents'." + (setq package-archive-contents nil) (dolist (archive package-archives) (package-read-archive-contents (car archive)))) ------------------------------------------------------------ revno: 102324 committer: Agustin Martin branch nick: trunk timestamp: Wed 2010-11-10 18:25:13 +0100 message: lisp/Changelog: Fix r102323 entry to use correct format with real submitter. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 10:54:43 +0000 +++ lisp/ChangeLog 2010-11-10 17:25:13 +0000 @@ -1,8 +1,8 @@ -2010-11-10 Agustín Martín +2010-11-10 Brandon Craig Rhodes * textmodes/flyspell.el (flyspell-word): Do not re-check words already found as misspellings by (flyspell-large-region), just - do highlighting. Patch by Brandon Craig Rhodes (bug#7322) + do highlighting (bug#7322). 2010-11-10 Glenn Morris ------------------------------------------------------------ revno: 102323 committer: Agustin Martin branch nick: trunk timestamp: Wed 2010-11-10 11:54:43 +0100 message: flyspell.el (flyspell-word): Do not re-check known misspellings. Avoid re-checking words already found as misspellings by (flyspell-large-region), just do highlighting. Patch by Brandon Craig Rhodes (bug#7322) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 08:21:06 +0000 +++ lisp/ChangeLog 2010-11-10 10:54:43 +0000 @@ -1,3 +1,9 @@ +2010-11-10 Agustín Martín + + * textmodes/flyspell.el (flyspell-word): Do not re-check words + already found as misspellings by (flyspell-large-region), just + do highlighting. Patch by Brandon Craig Rhodes (bug#7322) + 2010-11-10 Glenn Morris * progmodes/octave-mod.el (octave-mark-block): Update for smie change. === modified file 'lisp/textmodes/flyspell.el' --- lisp/textmodes/flyspell.el 2010-11-07 01:36:33 +0000 +++ lisp/textmodes/flyspell.el 2010-11-10 10:54:43 +0000 @@ -1013,11 +1013,13 @@ ;;*---------------------------------------------------------------------*/ ;;* flyspell-word ... */ ;;*---------------------------------------------------------------------*/ -(defun flyspell-word (&optional following) +(defun flyspell-word (&optional following known-misspelling) "Spell check a word. If the optional argument FOLLOWING, or, when called interactively `ispell-following-word', is non-nil, checks the following (rather -than preceding) word when the cursor is not over a word." +than preceding) word when the cursor is not over a word. If +optional argument KNOWN-MISSPELLING is non nil considers word a +misspelling and skips redundant spell-checking step." (interactive (list ispell-following-word)) (ispell-set-spellchecker-params) ; Initialize variables and dicts alists (save-excursion @@ -1078,29 +1080,35 @@ (setq flyspell-word-cache-end end) (setq flyspell-word-cache-word word) ;; now check spelling of word. - (ispell-send-string "%\n") - ;; put in verbose mode - (ispell-send-string (concat "^" word "\n")) - ;; we mark the ispell process so it can be killed - ;; when emacs is exited without query - (set-process-query-on-exit-flag ispell-process nil) - ;; Wait until ispell has processed word. Since this code is often - ;; executed from post-command-hook but the ispell process may not - ;; be responsive, it's important to make sure we re-enable C-g. - (with-local-quit - (while (progn - (accept-process-output ispell-process) - (not (string= "" (car ispell-filter)))))) - ;; (ispell-send-string "!\n") - ;; back to terse mode. - ;; Remove leading empty element - (setq ispell-filter (cdr ispell-filter)) - ;; ispell process should return something after word is sent. - ;; Tag word as valid (i.e., skip) otherwise - (or ispell-filter - (setq ispell-filter '(*))) - (if (consp ispell-filter) - (setq poss (ispell-parse-output (car ispell-filter)))) + (if (not known-misspelling) + (progn + (ispell-send-string "%\n") + ;; put in verbose mode + (ispell-send-string (concat "^" word "\n")) + ;; we mark the ispell process so it can be killed + ;; when emacs is exited without query + (set-process-query-on-exit-flag ispell-process nil) + ;; Wait until ispell has processed word. Since this + ;; code is often executed from post-command-hook but + ;; the ispell process may not be responsive, it's + ;; important to make sure we re-enable C-g. + (with-local-quit + (while (progn + (accept-process-output ispell-process) + (not (string= "" (car ispell-filter)))))) + ;; (ispell-send-string "!\n") + ;; back to terse mode. + ;; Remove leading empty element + (setq ispell-filter (cdr ispell-filter)) + ;; ispell process should return something after word is sent. + ;; Tag word as valid (i.e., skip) otherwise + (or ispell-filter + (setq ispell-filter '(*))) + (if (consp ispell-filter) + (setq poss (ispell-parse-output (car ispell-filter))))) + ;; Else, this was a known misspelling to begin with, and + ;; we should forge an ispell return value. + (setq poss (list word 0 '() '()))) (let ((res (cond ((eq poss t) ;; correct (setq flyspell-word-cache-result t) @@ -1433,7 +1441,7 @@ t nil)))) (setq keep nil) - (flyspell-word) + (flyspell-word nil t) ;; Search for next misspelled word will begin from ;; end of last validated match. (setq buffer-scan-pos (point)))) ------------------------------------------------------------ revno: 102322 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-11-10 10:08:05 +0100 message: Fix syntax error in previous commit. diff: === modified file 'src/dbusbind.c' --- src/dbusbind.c 2010-11-10 08:48:18 +0000 +++ src/dbusbind.c 2010-11-10 09:08:05 +0000 @@ -163,7 +163,7 @@ || (type == DBUS_TYPE_DOUBLE) \ || (type == DBUS_TYPE_STRING) \ || (type == DBUS_TYPE_OBJECT_PATH) \ - || (type == DBUS_TYPE_SIGNATURE \ + || (type == DBUS_TYPE_SIGNATURE) \ || (type == DBUS_TYPE_UNIX_FD)) #else #define XD_BASIC_DBUS_TYPE(type) \ ------------------------------------------------------------ revno: 102321 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Wed 2010-11-10 18:02:54 +0900 message: Add const to array elements of font filter properties. * font.c (font_filter_properties): Add const to array elements of properties args. * font.h (font_filter_properties): Likewise. * ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array elements. * w32font.c (w32font_booleans, w32font_non_booleans): Likewise. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-10 08:48:18 +0000 +++ src/ChangeLog 2010-11-10 09:02:54 +0000 @@ -1,3 +1,15 @@ +2010-11-10 YAMAMOTO Mitsuharu + + * font.c (font_filter_properties): Add const to array elements of + properties args. + + * font.h (font_filter_properties): Likewise. + + * ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array + elements. + + * w32font.c (w32font_booleans, w32font_non_booleans): Likewise. + 2010-11-10 Michael Albinus * dbusbind.c (QCdbus_type_unix_fd): New Lisp object. === modified file 'src/font.c' --- src/font.c 2010-11-09 20:07:10 +0000 +++ src/font.c 2010-11-10 09:02:54 +0000 @@ -3732,8 +3732,8 @@ void font_filter_properties (Lisp_Object font, Lisp_Object alist, - const char *boolean_properties[], - const char *non_boolean_properties[]) + const char *const boolean_properties[], + const char *const non_boolean_properties[]) { Lisp_Object it; int i; === modified file 'src/font.h' --- src/font.h 2010-10-14 14:32:27 +0000 +++ src/font.h 2010-11-10 09:02:54 +0000 @@ -823,8 +823,8 @@ extern void font_filter_properties (Lisp_Object font, Lisp_Object alist, - const char *boolean_properties[], - const char *non_boolean_properties[]); + const char *const boolean_properties[], + const char *const non_boolean_properties[]); #ifdef HAVE_FREETYPE extern struct font_driver ftfont_driver; === modified file 'src/ftfont.c' --- src/ftfont.c 2010-10-14 14:32:27 +0000 +++ src/ftfont.c 2010-11-10 09:02:54 +0000 @@ -2598,7 +2598,7 @@ return intern ("unknown"); } -static const char *ftfont_booleans [] = { +static const char *const ftfont_booleans [] = { ":antialias", ":hinting", ":verticallayout", @@ -2611,7 +2611,7 @@ NULL, }; -static const char *ftfont_non_booleans [] = { +static const char *const ftfont_non_booleans [] = { ":family", ":familylang", ":style", === modified file 'src/w32font.c' --- src/w32font.c 2010-10-14 14:32:27 +0000 +++ src/w32font.c 2010-11-10 09:02:54 +0000 @@ -2377,11 +2377,11 @@ return DECODE_SYSTEM (build_string (buf)); } -static const char *w32font_booleans [] = { +static const char *const w32font_booleans [] = { NULL, }; -static const char *w32font_non_booleans [] = { +static const char *const w32font_non_booleans [] = { ":script", ":antialias", ":style", ------------------------------------------------------------ revno: 102320 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-11-10 09:48:18 +0100 message: * dbusbind.c (QCdbus_type_unix_fd): New Lisp object. (XD_BASIC_DBUS_TYPE, xd_symbol_to_dbus_type, xd_signature) (xd_append_arg, xd_retrieve_arg): Support DBUS_TYPE_UNIX_FD. (Fdbus_call_method): Add DBUS_TYPE_UNIX_FD type mapping to doc string. (syms_of_dbusbind): Initialize QCdbus_type_unix_fd). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-10 03:45:29 +0000 +++ src/ChangeLog 2010-11-10 08:48:18 +0000 @@ -1,3 +1,11 @@ +2010-11-10 Michael Albinus + + * dbusbind.c (QCdbus_type_unix_fd): New Lisp object. + (XD_BASIC_DBUS_TYPE, xd_symbol_to_dbus_type, xd_signature) + (xd_append_arg, xd_retrieve_arg): Support DBUS_TYPE_UNIX_FD. + (Fdbus_call_method): Add DBUS_TYPE_UNIX_FD type mapping to doc string. + (syms_of_dbusbind): Initialize QCdbus_type_unix_fd). + 2010-11-10 Glenn Morris * emacs.c (syms_of_emacs) : Doc fix. === modified file 'src/dbusbind.c' --- src/dbusbind.c 2010-11-01 15:18:42 +0000 +++ src/dbusbind.c 2010-11-10 08:48:18 +0000 @@ -57,6 +57,9 @@ Lisp_Object QCdbus_type_int64, QCdbus_type_uint64; Lisp_Object QCdbus_type_double, QCdbus_type_string; Lisp_Object QCdbus_type_object_path, QCdbus_type_signature; +#ifdef DBUS_TYPE_UNIX_FD +Lisp_Object QCdbus_type_unix_fd; +#endif Lisp_Object QCdbus_type_array, QCdbus_type_variant; Lisp_Object QCdbus_type_struct, QCdbus_type_dict_entry; @@ -147,6 +150,22 @@ #endif /* Check whether TYPE is a basic DBusType. */ +#ifdef DBUS_TYPE_UNIX_FD +#define XD_BASIC_DBUS_TYPE(type) \ + ((type == DBUS_TYPE_BYTE) \ + || (type == DBUS_TYPE_BOOLEAN) \ + || (type == DBUS_TYPE_INT16) \ + || (type == DBUS_TYPE_UINT16) \ + || (type == DBUS_TYPE_INT32) \ + || (type == DBUS_TYPE_UINT32) \ + || (type == DBUS_TYPE_INT64) \ + || (type == DBUS_TYPE_UINT64) \ + || (type == DBUS_TYPE_DOUBLE) \ + || (type == DBUS_TYPE_STRING) \ + || (type == DBUS_TYPE_OBJECT_PATH) \ + || (type == DBUS_TYPE_SIGNATURE \ + || (type == DBUS_TYPE_UNIX_FD)) +#else #define XD_BASIC_DBUS_TYPE(type) \ ((type == DBUS_TYPE_BYTE) \ || (type == DBUS_TYPE_BOOLEAN) \ @@ -160,6 +179,7 @@ || (type == DBUS_TYPE_STRING) \ || (type == DBUS_TYPE_OBJECT_PATH) \ || (type == DBUS_TYPE_SIGNATURE)) +#endif /* This was a macro. On Solaris 2.11 it was said to compile for hours, when optimzation is enabled. So we have transferred it into @@ -182,6 +202,9 @@ : (EQ (object, QCdbus_type_string)) ? DBUS_TYPE_STRING : (EQ (object, QCdbus_type_object_path)) ? DBUS_TYPE_OBJECT_PATH : (EQ (object, QCdbus_type_signature)) ? DBUS_TYPE_SIGNATURE +#ifdef DBUS_TYPE_UNIX_FD + : (EQ (object, QCdbus_type_unix_fd)) ? DBUS_TYPE_UNIX_FD +#endif : (EQ (object, QCdbus_type_array)) ? DBUS_TYPE_ARRAY : (EQ (object, QCdbus_type_variant)) ? DBUS_TYPE_VARIANT : (EQ (object, QCdbus_type_struct)) ? DBUS_TYPE_STRUCT @@ -238,6 +261,9 @@ case DBUS_TYPE_UINT16: case DBUS_TYPE_UINT32: case DBUS_TYPE_UINT64: +#ifdef DBUS_TYPE_UNIX_FD + case DBUS_TYPE_UNIX_FD: +#endif CHECK_NATNUM (object); sprintf (signature, "%c", dtype); break; @@ -451,6 +477,9 @@ } case DBUS_TYPE_UINT32: +#ifdef DBUS_TYPE_UNIX_FD + case DBUS_TYPE_UNIX_FD: +#endif CHECK_NUMBER (object); { dbus_uint32_t val = XUINT (object); @@ -648,6 +677,9 @@ } case DBUS_TYPE_UINT32: +#ifdef DBUS_TYPE_UNIX_FD + case DBUS_TYPE_UNIX_FD: +#endif { dbus_uint32_t val; dbus_message_iter_get_basic (iter, &val); @@ -983,6 +1015,7 @@ DBUS_TYPE_UINT16 => number DBUS_TYPE_INT16 => integer DBUS_TYPE_UINT32 => number or float + DBUS_TYPE_UNIX_FD => number or float DBUS_TYPE_INT32 => integer or float DBUS_TYPE_UINT64 => number or float DBUS_TYPE_INT64 => integer or float @@ -2104,6 +2137,11 @@ QCdbus_type_signature = intern_c_string (":signature"); staticpro (&QCdbus_type_signature); +#ifdef DBUS_TYPE_UNIX_FD + QCdbus_type_unix_fd = intern_c_string (":unix-fd"); + staticpro (&QCdbus_type_unix_fd); +#endif + QCdbus_type_array = intern_c_string (":array"); staticpro (&QCdbus_type_array); ------------------------------------------------------------ revno: 102319 committer: Michael Albinus branch nick: trunk timestamp: Wed 2010-11-10 09:41:53 +0100 message: * dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-11-09 22:17:36 +0000 +++ doc/misc/ChangeLog 2010-11-10 08:41:53 +0000 @@ -1,3 +1,7 @@ +2010-11-10 Michael Albinus + + * dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping. + 2010-11-09 Lars Magne Ingebrigtsen * gnus.texi (Article Washing): Document gnus-article-treat-non-ascii. === modified file 'doc/misc/dbus.texi' --- doc/misc/dbus.texi 2010-08-23 13:48:48 +0000 +++ doc/misc/dbus.texi 2010-11-10 08:41:53 +0000 @@ -890,7 +890,8 @@ types are represented by the type symbols @code{:byte}, @code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32}, @code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double}, -@code{:string}, @code{:object-path} and @code{:signature}. +@code{:string}, @code{:object-path}, @code{:signature} and +@code{:unix-fd}. @noindent Example: @@ -1009,6 +1010,7 @@ @item DBUS_TYPE_UINT16 @tab @expansion{} @tab natural number @item DBUS_TYPE_INT16 @tab @expansion{} @tab integer @item DBUS_TYPE_UINT32 @tab @expansion{} @tab natural number or float +@item DBUS_TYPE_UNIX_FD @tab @expansion{} @tab natural number or float @item DBUS_TYPE_INT32 @tab @expansion{} @tab integer or float @item DBUS_TYPE_UINT64 @tab @expansion{} @tab natural number or float @item DBUS_TYPE_INT64 @tab @expansion{} @tab integer or float @@ -1024,9 +1026,9 @@ @end example A float object in case of @code{DBUS_TYPE_UINT32}, -@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64} and -@code{DBUS_TYPE_INT6432} is returned, when the C value exceeds the -Emacs number size range. +@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64}, +@code{DBUS_TYPE_INT64} and @code{DBUS_TYPE_UNIX_FD} is returned, when +the C value exceeds the Emacs number size range. The resulting list of the last 4 D-Bus compound types contains as elements the elements of the D-Bus container, mapped according to the ------------------------------------------------------------ revno: 102318 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-11-10 00:21:06 -0800 message: * lisp/progmodes/octave-mod.el (octave-mark-block): Update for smie change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 07:59:00 +0000 +++ lisp/ChangeLog 2010-11-10 08:21:06 +0000 @@ -1,5 +1,7 @@ 2010-11-10 Glenn Morris + * progmodes/octave-mod.el (octave-mark-block): Update for smie change. + * emulation/edt.el (edt-with-position): New macro. (edt-find-forward, edt-find-backward, edt-find-next-forward) (edt-find-next-backward, edt-sentence-forward, edt-sentence-backward) === modified file 'lisp/progmodes/octave-mod.el' --- lisp/progmodes/octave-mod.el 2010-11-07 15:45:45 +0000 +++ lisp/progmodes/octave-mod.el 2010-11-10 08:21:06 +0000 @@ -1,7 +1,7 @@ ;;; octave-mod.el --- editing Octave source files under Emacs -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Kurt Hornik ;; Author: John Eaton @@ -829,7 +829,7 @@ (unless (or (looking-at "\\s(") (save-excursion (let* ((token (funcall smie-forward-token-function)) - (level (assoc token smie-op-levels))) + (level (assoc token smie-grammar))) (and level (null (cadr level)))))) (backward-up-list 1)) (mark-sexp)) @@ -1228,5 +1228,4 @@ (provide 'octave-mod) -;; arch-tag: 05f1ce09-be87-4c00-803e-4919ffa26c23 ;;; octave-mod.el ends here ------------------------------------------------------------ revno: 102317 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-09 23:59:00 -0800 message: * lisp/textmodes/texnfo-upd.el (texinfo-pointer-name): Fix typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-10 05:24:48 +0000 +++ lisp/ChangeLog 2010-11-10 07:59:00 +0000 @@ -8,6 +8,8 @@ * emulation/tpu-extras.el (tpu-with-position): New macro. (tpu-paragraph, tpu-page, tpu-search-internal): Use it. + * textmodes/texnfo-upd.el (texinfo-pointer-name): Fix typo. + * textmodes/texnfo-upd.el (texinfo-all-menus-update) (texinfo-menu-copy-old-description, texinfo-start-menu-description) (texinfo-master-menu, texinfo-insert-node-lines) === modified file 'lisp/textmodes/texnfo-upd.el' --- lisp/textmodes/texnfo-upd.el 2010-11-10 04:35:18 +0000 +++ lisp/textmodes/texnfo-upd.el 2010-11-10 07:59:00 +0000 @@ -1439,8 +1439,7 @@ (end-of-line) ; this handles prev node top case (re-search-backward ; when point is already "^@node" ; at the beginning of @node line - ;; FIXME this can't be right. Missing the point? - (save-excursion (forward-line -3)) + (line-beginning-position -2) t) (setq name (texinfo-copy-node-name))) ((eq kind 'no-pointer)