diff options
Diffstat (limited to 'lisp')
35 files changed, 982 insertions, 526 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07f700f6987..1f82735806a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,109 @@ +2011-06-02 Stefan Monnier <monnier@iro.umontreal.ca> + + * net/tramp.el (tramp-with-progress-reporter): Rename from + with-progress-reporter. Use `declare'. + * net/tramp-smb.el: + * net/tramp-sh.el: + * net/tramp-gvfs.el: Update all uses. + +2011-06-02 Jay Belanger <jay.p.belanger@gmail.com> + + * calc/calc.el (calc-kill-stack-buffer): Make sure that the trail + buffer isn't killed before making it current. + +2011-06-01 Stefan Monnier <monnier@iro.umontreal.ca> + + Silence various byte-compiler warnings. + * emacs-lisp/byte-run.el (make-obsolete-variable): New argument + `access-type' and new obsolescence format. + * emacs-lisp/bytecomp.el (byte-compile-warn-obsolete): Adjust to + new format. + (byte-compile-check-variable): New `access-type' argument. + Only warn if the access-type is obsolete. + (byte-compile-dynamic-variable-bind, byte-compile-variable-ref) + (byte-compile-variable-set): Adjust callers. + * help-fns.el (describe-variable): Adjust to new obsolescence format. + * mail/sendmail.el (mail-mailer-swallows-blank-line): Only mark + setting it as obsolete. + * simple.el (minibuffer-completing-symbol): + * font-lock.el (font-lock-beginning-of-syntax-function): Only mark read + access as obsolete. + * minibuffer.el (minibuffer-completing-file-name): Don't make it + obsolete yet. + * international/quail.el (quail-mouse-choose-completion): Remove unused + code referring to obsolete var. + (quail-choose-completion-string): Remove. + * server.el (server-clients-with, server-kill-buffer-query-function) + (server-kill-emacs-query-function): Silence "unused `proc'" warnings. + * proced.el (proced-send-signal): + * emacs-lisp/lisp.el (lisp-complete-symbol): + Replace completion-annotate-function with completion-extra-properties. + +2011-06-01 Stefan Monnier <monnier@iro.umontreal.ca> + + * simple.el (goto-line): Use read-number. + (overriding-map-is-bound): Remove. + (saved-overriding-map): Change default. + (save&set-overriding-map): Rename from ensure-overriding-map-is-bound; + Take the map as argument. + (universal-argument, negative-argument, digit-argument): Use it. + (restore-overriding-map): Adjust. + (do-auto-fill): Use fill-forward-paragraph. + (keyboard-quit): Don't signal an error when debug-on-quit is non-nil. + + * minibuffer.el (minibuffer-inactive-mode-map): New var. + (minibuffer-inactive-mode): New major mode. + * mouse.el (mouse-drag-region): Remove the "mouse-1 pops up + the *Messages* buffer" hack. + (mouse-popup-menubar): Don't burp if the event is a normal key. + + Miscellaneous tweaks. + * emacs-lisp/cl-macs.el (dolist, dotimes): Use the same strategy for + lexical scoping as in subr.el's dolist and dotimes. + * emacs-lisp/bytecomp.el (byte-compile-unfold-bcf): + Silence compiler warning. + * thingatpt.el (forward-whitespace): Trivial coding style fix. + * subr.el (with-output-to-temp-buffer): Provide an edebug spec. + * international/ccl.el (ccl-compile): Trivial simplification. + * help-fns.el (help-do-arg-highlight): Silence compiler warning. + * emacs-lisp/testcover.el (testcover-end): Remove spurious + `printflag' argument. + * emacs-lisp/byte-run.el (make-obsolete, make-obsolete-variable): + Purecopy the whole obsolescence data. + +2011-06-01 Leo Liu <sdl.web@gmail.com> + + * net/rcirc.el (rcirc-decode-coding-system): Revert last change; + improve doc-string as suggested by Marco Pessotto + <melmothx@gmail.com>. + (rcirc-print): Fix last change. + +2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca> + + * minibuffer.el (complete-with-action): Return nil for the metadata and + boundaries of non-functional tables. + (completion-table-dynamic): Return nil for the metadata. + (completion-table-with-terminator): Add default case, using + complete-with-action. + (completion--metadata): New function. + (completion-all-sorted-completions, minibuffer-completion-help): Use it + to try and avoid pathological performance problems. + (completion--embedded-envvar-table): Return `category' metadata. + +2011-05-31 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * subr.el (process-alive-p): New tiny convenience function. + +2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/debug.el (debug): Save&restore not just the buffer's + content but also its previous major mode. + +2011-05-31 Helmut Eller <eller.helmut@gmail.com> + + * debug.el (debug): Restore the previous content of the + *Backtrace* buffer when we exit with C-M-c. + 2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca> * minibuffer.el: Add metadata method to completion tables. @@ -30,6 +136,10 @@ (rcirc-decode-coding-system): Allow value nil for automatic coding system detection. +2011-06-01 Glenn Morris <rgm@gnu.org> + + * mail/emacsbug.el (report-emacs-bug-hook): Mailclient ignores From. + 2011-05-29 Chong Yidong <cyd@stupidchicken.com> * image.el (image-animate-max-time): Allow nil and t values. diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 41f549cbe2c..55ac412b435 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1293,19 +1293,20 @@ the trail buffer." (if (not info-list) (progn (setq calc-buffer-list (delete cb calc-buffer-list)) - (with-current-buffer calc-trail-buffer - (if (eq cb calc-main-buffer) - ;; If there are other Calc stacks, make another one - ;; the calc-main-buffer ... - (if calc-buffer-list - (setq calc-main-buffer (car calc-buffer-list)) - ;; ... otherwise kill the trail and its windows. - (let ((wl (get-buffer-window-list calc-trail-buffer))) - (while wl - (delete-window (car wl)) - (setq wl (cdr wl)))) - (kill-buffer calc-trail-buffer) - (setq calc-trail-buffer nil)))) + (if (buffer-live-p calc-trail-buffer) + (with-current-buffer calc-trail-buffer + (if (eq cb calc-main-buffer) + ;; If there are other Calc stacks, make another one + ;; the calc-main-buffer ... + (if calc-buffer-list + (setq calc-main-buffer (car calc-buffer-list)) + ;; ... otherwise kill the trail and its windows. + (let ((wl (get-buffer-window-list calc-trail-buffer))) + (while wl + (delete-window (car wl)) + (setq wl (cdr wl)))) + (kill-buffer calc-trail-buffer))))) + (setq calc-trail-buffer nil) t)))) (defun calc-mode () diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index c76cdffd62f..f79add14836 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -120,13 +120,13 @@ convention was modified." The warning will say that CURRENT-NAME should be used instead. If CURRENT-NAME is a string, that is the `use instead' message \(it should end with a period, and not start with a capital). -If provided, WHEN should be a string indicating when the function +WHEN should be a string indicating when the function was first made obsolete, for example a date or a release number." (interactive "aMake function obsolete: \nxObsoletion replacement: ") (put obsolete-name 'byte-obsolete-info ;; The second entry used to hold the `byte-compile' handler, but ;; is not used any more nowadays. - (list (purecopy current-name) nil (purecopy when))) + (purecopy (list current-name nil when))) obsolete-name) (set-advertised-calling-convention ;; New code should always provide the `when' argument. @@ -153,27 +153,21 @@ See the docstrings of `defalias' and `make-obsolete' for more details." 'define-obsolete-function-alias '(obsolete-name current-name when &optional docstring) "23.1") -(defun make-obsolete-variable (obsolete-name current-name &optional when) +(defun make-obsolete-variable (obsolete-name current-name &optional when access-type) "Make the byte-compiler warn that OBSOLETE-NAME is obsolete. The warning will say that CURRENT-NAME should be used instead. If CURRENT-NAME is a string, that is the `use instead' message. -If provided, WHEN should be a string indicating when the variable -was first made obsolete, for example a date or a release number." - (interactive - (list - (let ((str (completing-read "Make variable obsolete: " obarray 'boundp t))) - (if (equal str "") (error "")) - (intern str)) - (car (read-from-string (read-string "Obsoletion replacement: "))))) +WHEN should be a string indicating when the variable +was first made obsolete, for example a date or a release number. +ACCESS-TYPE if non-nil should specify the kind of access that will trigger + obsolescence warnings; it can be either `get' or `set'." (put obsolete-name 'byte-obsolete-variable - (cons - (if (stringp current-name) - (purecopy current-name) - current-name) (purecopy when))) + (purecopy (list current-name access-type when))) obsolete-name) (set-advertised-calling-convention ;; New code should always provide the `when' argument. - 'make-obsolete-variable '(obsolete-name current-name when) "23.1") + 'make-obsolete-variable + '(obsolete-name current-name when &optional access-type) "23.1") (defmacro define-obsolete-variable-alias (obsolete-name current-name &optional when docstring) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 0dae6748c24..1e7ee315942 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1109,7 +1109,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (let* ((funcp (get symbol 'byte-obsolete-info)) (obsolete (or funcp (get symbol 'byte-obsolete-variable))) (instead (car obsolete)) - (asof (if funcp (nth 2 obsolete) (cdr obsolete)))) + (asof (nth 2 obsolete))) (unless (and funcp (memq symbol byte-compile-not-obsolete-funcs)) (byte-compile-warn "`%s' is an obsolete %s%s%s" symbol (if funcp "function" "variable") @@ -2991,7 +2991,7 @@ That command is designed for interactive use only" fn)) (cond ((<= (+ alen alen) fmax2) ;; Add missing &optional (or &rest) arguments. - (dotimes (i (- (/ (1+ fmax2) 2) alen)) + (dotimes (_ (- (/ (1+ fmax2) 2) alen)) (byte-compile-push-constant nil))) ((zerop (logand fmax2 1)) (byte-compile-log-warning "Too many arguments for inlined function" @@ -3016,20 +3016,24 @@ That command is designed for interactive use only" fn)) (assert (eq byte-compile-depth (1+ start-depth)) nil "Wrong depth start=%s end=%s" start-depth byte-compile-depth))) -(defun byte-compile-check-variable (var &optional binding) - "Do various error checks before a use of the variable VAR. -If BINDING is non-nil, VAR is being bound." +(defun byte-compile-check-variable (var access-type) + "Do various error checks before a use of the variable VAR." (when (symbolp var) (byte-compile-set-symbol-position var)) (cond ((or (not (symbolp var)) (byte-compile-const-symbol-p var)) (when (byte-compile-warning-enabled-p 'constants) - (byte-compile-warn (if binding + (byte-compile-warn (if (eq access-type 'let-bind) "attempt to let-bind %s `%s`" "variable reference to %s `%s'") (if (symbolp var) "constant" "nonvariable") (prin1-to-string var)))) - ((and (get var 'byte-obsolete-variable) - (not (memq var byte-compile-not-obsolete-vars))) + ((let ((od (get var 'byte-obsolete-variable))) + (and od + (not (memq var byte-compile-not-obsolete-vars)) + (or (case (nth 1 od) + (set (not (eq access-type 'reference))) + (get (eq access-type 'reference)) + (t t))))) (byte-compile-warn-obsolete var)))) (defsubst byte-compile-dynamic-variable-op (base-op var) @@ -3041,13 +3045,13 @@ If BINDING is non-nil, VAR is being bound." (defun byte-compile-dynamic-variable-bind (var) "Generate code to bind the lexical variable VAR to the top-of-stack value." - (byte-compile-check-variable var t) + (byte-compile-check-variable var 'let-bind) (push var byte-compile-bound-variables) (byte-compile-dynamic-variable-op 'byte-varbind var)) (defun byte-compile-variable-ref (var) "Generate code to push the value of the variable VAR on the stack." - (byte-compile-check-variable var) + (byte-compile-check-variable var 'reference) (let ((lex-binding (assq var byte-compile--lexical-environment))) (if lex-binding ;; VAR is lexically bound @@ -3063,7 +3067,7 @@ If BINDING is non-nil, VAR is being bound." (defun byte-compile-variable-set (var) "Generate code to set the variable VAR from the top-of-stack value." - (byte-compile-check-variable var) + (byte-compile-check-variable var 'assign) (let ((lex-binding (assq var byte-compile--lexical-environment))) (if lex-binding ;; VAR is lexically bound diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 38584c437b8..742a98f5e7b 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -112,16 +112,6 @@ ;; ,@(mapcar (lambda (binder) (if (consp binder) (cadr binder))) ;; binders))) -;; (defmacro letrec (binders &rest body) -;; ;; Only useful in lexical-binding mode. -;; ;; As a special-form, we could implement it more efficiently (and cleanly, -;; ;; making the vars actually unbound during evaluation of the binders). -;; `(let ,(mapcar (lambda (binder) (if (consp binder) (car binder) binder)) -;; binders) -;; ,@(delq nil (mapcar (lambda (binder) (if (consp binder) `(setq ,@binder))) -;; binders)) -;; ,@body)) - (eval-when-compile (require 'cl)) (defconst cconv-liftwhen 6 diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 9ce3dd6a7fe..2813cc4f065 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1236,14 +1236,29 @@ Then evaluate RESULT to get return value, default nil. \(fn (VAR LIST [RESULT]) BODY...)" (let ((temp (make-symbol "--cl-dolist-temp--"))) - (list 'block nil - (list* 'let (list (list temp (nth 1 spec)) (car spec)) - (list* 'while temp (list 'setq (car spec) (list 'car temp)) - (append body (list (list 'setq temp - (list 'cdr temp))))) - (if (cdr (cdr spec)) - (cons (list 'setq (car spec) nil) (cdr (cdr spec))) - '(nil)))))) + ;; FIXME: Copy&pasted from subr.el. + `(block nil + ;; This is not a reliable test, but it does not matter because both + ;; semantics are acceptable, tho one is slightly faster with dynamic + ;; scoping and the other is slightly faster (and has cleaner semantics) + ;; with lexical scoping. + ,(if lexical-binding + `(let ((,temp ,(nth 1 spec))) + (while ,temp + (let ((,(car spec) (car ,temp))) + ,@body + (setq ,temp (cdr ,temp)))) + ,@(if (cdr (cdr spec)) + ;; FIXME: This let often leads to "unused var" warnings. + `((let ((,(car spec) nil)) ,@(cdr (cdr spec)))))) + `(let ((,temp ,(nth 1 spec)) + ,(car spec)) + (while ,temp + (setq ,(car spec) (car ,temp)) + ,@body + (setq ,temp (cdr ,temp))) + ,@(if (cdr (cdr spec)) + `((setq ,(car spec) nil) ,@(cddr spec)))))))) ;;;###autoload (defmacro dotimes (spec &rest body) @@ -1253,12 +1268,30 @@ to COUNT, exclusive. Then evaluate RESULT to get return value, default nil. \(fn (VAR COUNT [RESULT]) BODY...)" - (let ((temp (make-symbol "--cl-dotimes-temp--"))) - (list 'block nil - (list* 'let (list (list temp (nth 1 spec)) (list (car spec) 0)) - (list* 'while (list '< (car spec) temp) - (append body (list (list 'incf (car spec))))) - (or (cdr (cdr spec)) '(nil)))))) + (let ((temp (make-symbol "--cl-dotimes-temp--")) + (end (nth 1 spec))) + ;; FIXME: Copy&pasted from subr.el. + `(block nil + ;; This is not a reliable test, but it does not matter because both + ;; semantics are acceptable, tho one is slightly faster with dynamic + ;; scoping and the other has cleaner semantics. + ,(if lexical-binding + (let ((counter '--dotimes-counter--)) + `(let ((,temp ,end) + (,counter 0)) + (while (< ,counter ,temp) + (let ((,(car spec) ,counter)) + ,@body) + (setq ,counter (1+ ,counter))) + ,@(if (cddr spec) + ;; FIXME: This let often leads to "unused var" warnings. + `((let ((,(car spec) ,counter)) ,@(cddr spec)))))) + `(let ((,temp ,end) + (,(car spec) 0)) + (while (< ,(car spec) ,temp) + ,@body + (incf ,(car spec))) + ,@(cdr (cdr spec))))))) ;;;###autoload (defmacro do-symbols (spec &rest body) diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 88633eaaa46..28962595ace 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -118,6 +118,10 @@ first will be printed into the backtrace buffer." (let (debugger-value (debug-on-error nil) (debug-on-quit nil) + (debugger-previous-state + (if (get-buffer "*Backtrace*") + (with-current-buffer (get-buffer "*Backtrace*") + (list major-mode (buffer-string))))) (debugger-buffer (get-buffer-create "*Backtrace*")) (debugger-old-buffer (current-buffer)) (debugger-step-after-exit nil) @@ -214,8 +218,6 @@ first will be printed into the backtrace buffer." ;; recreate it every time the debugger stops, so instead we'll ;; erase it (and maybe hide it) but keep it alive. (with-current-buffer debugger-buffer - (erase-buffer) - (fundamental-mode) (with-selected-window (get-buffer-window debugger-buffer 0) (when (and (window-dedicated-p (selected-window)) (not debugger-will-be-back)) @@ -232,7 +234,17 @@ first will be printed into the backtrace buffer." ;; to be left at the top-level, still working on how ;; best to do that. (bury-buffer)))) - (kill-buffer debugger-buffer)) + (unless debugger-previous-state + (kill-buffer debugger-buffer))) + ;; Restore the previous state of the debugger-buffer, in case we were + ;; in a recursive invocation of the debugger. + (when (and debugger-previous-state + (buffer-live-p debugger-buffer)) + (with-current-buffer debugger-buffer + (let ((inhibit-read-only t)) + (erase-buffer) + (insert (nth 1 debugger-previous-state)) + (funcall (nth 0 debugger-previous-state))))) (with-timeout-unsuspend debugger-with-timeout-suspend) (set-match-data debugger-outer-match-data))) ;; Put into effect the modified values of these variables diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index ece96fe2515..db6a03333d4 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -636,9 +636,8 @@ considered." (plist (nthcdr 3 data))) (if (null data) (minibuffer-message "Nothing to complete") - (let ((completion-annotate-function - (plist-get plist :annotation-function))) - (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) + (let ((completion-extra-properties plist)) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) (plist-get plist :predicate)))))) diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index 08f757819f2..2f168180cf6 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -430,7 +430,7 @@ FUN should be `testcover-reinstrument' for compositional functions, "Turn off instrumentation of all macros and functions in FILENAME." (interactive "fStop covering file: ") (let ((buf (find-file-noselect filename))) - (eval-buffer buf t))) + (eval-buffer buf))) ;;;========================================================================= diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 32fbb0608a2..e4dc6f11479 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -563,7 +563,7 @@ we recommend setting `syntax-begin-function' instead. This is normally set via `font-lock-defaults'.") (make-obsolete-variable 'font-lock-beginning-of-syntax-function - 'syntax-begin-function "23.3") + 'syntax-begin-function "23.3" 'set) (defvar font-lock-mark-block-function nil "*Non-nil means use this function to mark a block of text. diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index dcbc647950f..ff3eb98bb97 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,29 @@ +2011-06-01 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-registry.el (gnus-registry-remove-ignored): New function to + remove entries with groups we ignore. + +2011-05-31 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * shr.el (shr-rescale-image): Add an :ascent of 100 to images so that + the underline comes at the bottom. + +2011-05-31 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-registry.el (gnus-registry-article-marks-to-chars): Rename from + `gnus-registry-user-format-function-M' and declare the latter obsolete. + (gnus-registry-article-marks-to-names): Rename from + `gnus-registry-user-format-function-M2'. + +2011-05-31 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-sum.el (gnus-summary-exit): Make sure to kill article buffer in + ephemeral group. + +2011-05-31 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * shr.el (shr-browse-image): Copy the URL if called interactively. + 2011-05-30 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-group.el (gnus-group-mark-article-read): It's possible that we diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index e0efbaf4f30..a44986e2499 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -62,10 +62,10 @@ ;; show the marks as single characters (see the :char property in ;; `gnus-registry-marks'): -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars) ;; show the marks by name (see `gnus-registry-marks'): -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-names) ;; TODO: @@ -321,6 +321,20 @@ This is not required after changing `gnus-registry-cache-file'." (gnus-message 5 "Saving Gnus registry (size %d) to %s...done" (registry-size db) file))) +(defun gnus-registry-remove-ignored () + (interactive) + (let* ((db gnus-registry-db) + (grouphashtb (registry-lookup-secondary db 'group)) + (old-size (registry-size db))) + (registry-reindex db) + (loop for k being the hash-keys of grouphashtb + using (hash-values v) + when (gnus-registry-ignore-group-p k) + do (registry-delete db v nil)) + (registry-reindex db) + (gnus-message 4 "Removed %d ignored entries from the Gnus registry" + (- old-size (registry-size db))))) + ;; article move/copy/spool/delete actions (defun gnus-registry-action (action data-header from &optional to method) (let* ((id (mail-header-id data-header)) @@ -897,9 +911,12 @@ Uses `gnus-registry-marks' to find what shortcuts to install." nil (cons "Registry Marks" gnus-registry-misc-menus)))))) +(make-obsolete 'gnus-registry-user-format-function-M + 'gnus-registry-article-marks-to-chars "24.1") ? + ;; use like this: -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) -(defun gnus-registry-user-format-function-M (headers) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars) +(defun gnus-registry-article-marks-to-chars (headers) "Show the marks for an article by the :char property" (let* ((id (mail-header-message-id headers)) (marks (when id (gnus-registry-get-id-key id 'mark)))) @@ -911,8 +928,8 @@ Uses `gnus-registry-marks' to find what shortcuts to install." marks ""))) ;; use like this: -;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) -(defun gnus-registry-user-format-function-M2 (headers) +;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-names) +(defun gnus-registry-article-marks-to-names (headers) "Show the marks for an article by name" (let* ((id (mail-header-message-id headers)) (marks (when id (gnus-registry-get-id-key id 'mark)))) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 2d75c35158a..1c4382b24a6 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7194,7 +7194,11 @@ If FORCE (the prefix), also save the .newsrc file(s)." (article-buffer gnus-article-buffer) (mode major-mode) (group-point nil) - (buf (current-buffer))) + (buf (current-buffer)) + ;; `gnus-single-article-buffer' is nil buffer-locally in + ;; ephemeral group of which summary buffer will be killed, + ;; but the global value may be non-nil. + (single-article-buffer gnus-single-article-buffer)) (unless quit-config ;; Do adaptive scoring, and possibly save score files. (when gnus-newsgroup-adaptive @@ -7257,7 +7261,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (gnus-configure-windows 'group 'force))) ;; If we have several article buffers, we kill them at exit. - (unless gnus-single-article-buffer + (unless single-article-buffer (when (gnus-buffer-live-p article-buffer) (with-current-buffer article-buffer ;; Don't kill sticky article buffers diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index ebd854930df..67effc07ee2 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -183,14 +183,23 @@ redirects somewhere else." (message "No image under point") (message "%s" text)))) -(defun shr-browse-image () - "Browse the image under point." - (interactive) +(defun shr-browse-image (&optional copy-url) + "Browse the image under point. +If COPY-URL (the prefix if called interactively) is non-nil, copy +the URL of the image to the kill buffer instead." + (interactive "P") (let ((url (get-text-property (point) 'image-url))) - (if (not url) - (message "No image under point") + (cond + ((not url) + (message "No image under point")) + (copy-url + (with-temp-buffer + (insert url) + (copy-region-as-kill (point-min) (point-max)) + (message "Copied %s" url))) + (t (message "Browsing %s..." url) - (browse-url url)))) + (browse-url url))))) (defun shr-insert-image () "Insert the image under point into the buffer." @@ -524,8 +533,9 @@ redirects somewhere else." (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)) + (create-image data nil t + :ascent 100) + (let* ((image (create-image data nil t :ascent 100)) (size (image-size image t)) (width (car size)) (height (cdr size)) @@ -544,11 +554,13 @@ redirects somewhere else." (when (> (car size) window-width) (setq image (or (create-image data 'imagemagick t - :width window-width) + :width window-width + :ascent 100) image))) (when (and (fboundp 'create-animated-image) (eq (image-type data nil t) 'gif)) - (setq image (create-animated-image data 'gif t))) + (setq image (create-animated-image data 'gif t + :ascent 100))) image))) ;; url-cache-extract autoloads url-cache. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index ed1bd836fbf..1cd62c1dfa4 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -222,7 +222,7 @@ if the variable `help-downcase-arguments' is non-nil." (defun help-do-arg-highlight (doc args) (with-syntax-table (make-syntax-table emacs-lisp-mode-syntax-table) (modify-syntax-entry ?\- "w") - (dolist (arg args doc) + (dolist (arg args) (setq doc (replace-regexp-in-string ;; This is heuristic, but covers all common cases ;; except ARG1-ARG2 @@ -236,7 +236,8 @@ if the variable `help-downcase-arguments' is non-nil." "\\(?:-[{([<`\"].*?\\)?"; for ARG-{x}, (x), <x>, [x], `x' "\\>") ; end of word (help-highlight-arg arg) - doc t t 1))))) + doc t t 1))) + doc)) (defun help-highlight-arguments (usage doc &rest args) (when (and usage (string-match "^(" usage)) @@ -804,7 +805,8 @@ it is displayed along with the global value." (when obsolete (setq extra-line t) (princ " This variable is obsolete") - (if (cdr obsolete) (princ (format " since %s" (cdr obsolete)))) + (if (nth 2 obsolete) + (princ (format " since %s" (nth 2 obsolete)))) (princ (cond ((stringp use) (concat ";\n " use)) (use (format ";\n use `%s' instead." (car obsolete))) (t "."))) diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 2cae1262521..9614479072a 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -280,10 +280,10 @@ the current loop.") ;;;###autoload (defun ccl-compile (ccl-program) "Return the compiled code of CCL-PROGRAM as a vector of integers." - (if (or (null (consp ccl-program)) - (null (integerp (car ccl-program))) - (null (listp (car (cdr ccl-program))))) - (error "CCL: Invalid CCL program: %s" ccl-program)) + (unless (and (consp ccl-program) + (integerp (car ccl-program)) + (listp (car (cdr ccl-program)))) + (error "CCL: Invalid CCL program: %s" ccl-program)) (if (null (vectorp ccl-program-vector)) (setq ccl-program-vector (make-vector 8192 0))) (setq ccl-loop-head nil ccl-breaks nil) diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 3fb5818644b..f47d73a9508 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2253,12 +2253,10 @@ are shown (at most to the depth specified `quail-completion-max-depth')." ;; Give temporary modes such as isearch a chance to turn off. (run-hooks 'mouse-leave-buffer-hook) (let ((buffer (window-buffer)) - choice - base-size) + choice) (with-current-buffer (window-buffer (posn-window (event-start event))) (if completion-reference-buffer (setq buffer completion-reference-buffer)) - (setq base-size completion-base-size) (save-excursion (goto-char (posn-point (event-start event))) (let (beg end) @@ -2272,26 +2270,23 @@ are shown (at most to the depth specified `quail-completion-max-depth')." (setq end (or (next-single-property-change end 'mouse-face) (point-max))) (setq choice (buffer-substring beg end))))) -; (let ((owindow (selected-window))) -; (select-window (posn-window (event-start event))) -; (if (and (one-window-p t 'selected-frame) -; (window-dedicated-p (selected-window))) -; ;; This is a special buffer's frame -; (iconify-frame (selected-frame)) -; (or (window-dedicated-p (selected-window)) -; (bury-buffer))) -; (select-window owindow)) + ;; (let ((owindow (selected-window))) + ;; (select-window (posn-window (event-start event))) + ;; (if (and (one-window-p t 'selected-frame) + ;; (window-dedicated-p (selected-window))) + ;; ;; This is a special buffer's frame + ;; (iconify-frame (selected-frame)) + ;; (or (window-dedicated-p (selected-window)) + ;; (bury-buffer))) + ;; (select-window owindow)) (quail-delete-region) - (quail-choose-completion-string choice buffer base-size) + (setq quail-current-str choice) + ;; FIXME: We need to pass `base-position' here. + ;; FIXME: why do we need choose-completion-string with all its + ;; completion-specific logic? + (choose-completion-string choice buffer) (quail-terminate-translation))) -;; BASE-SIZE here is for compatibility with an (unused) arg of a -;; previous implementation. -(defun quail-choose-completion-string (choice &optional buffer base-size) - (setq quail-current-str choice) - ;; FIXME: We need to pass `base-position' here. - (choose-completion-string choice buffer)) - (defun quail-build-decode-map (map-list key decode-map num &optional maxnum ignores) "Build a decoding map. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index a89e760f0b9..bbf59e4e376 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -5,7 +5,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (19889 21967)) +;;;;;; "play/5x5.el" (19932 573)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -111,7 +111,7 @@ Completion is available. ;;;;;; add-change-log-entry-other-window add-change-log-entry find-change-log ;;;;;; prompt-for-change-log-name add-log-mailing-address add-log-full-name ;;;;;; add-log-current-defun-function) "add-log" "vc/add-log.el" -;;;;;; (19885 24894)) +;;;;;; (19931 11784)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -250,7 +250,7 @@ old-style time formats for entries are supported. ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (19878 51661)) +;;;;;; "advice" "emacs-lisp/advice.el" (19931 11784)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -486,7 +486,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;### (autoloads (outlineify-sticky allout-mode allout-mode-p allout-auto-activation ;;;;;; allout-setup allout-auto-activation-helper) "allout" "allout.el" -;;;;;; (19859 11635)) +;;;;;; (19931 11784)) ;;; Generated autoloads from allout.el (autoload 'allout-auto-activation-helper "allout" "\ @@ -528,11 +528,11 @@ With value nil, inhibit any automatic allout-mode activation.") (custom-autoload 'allout-auto-activation "allout" nil) -(put 'allout-use-hanging-indents 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) +(put 'allout-use-hanging-indents 'safe-local-variable (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) -(put 'allout-reindent-bodies 'safe-local-variable '(lambda (x) (memq x '(nil t text force)))) +(put 'allout-reindent-bodies 'safe-local-variable (lambda (x) (memq x '(nil t text force)))) -(put 'allout-show-bodies 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) +(put 'allout-show-bodies 'safe-local-variable (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) (put 'allout-header-prefix 'safe-local-variable 'stringp) @@ -542,19 +542,19 @@ With value nil, inhibit any automatic allout-mode activation.") (put 'allout-distinctive-bullets-string 'safe-local-variable 'stringp) -(put 'allout-use-mode-specific-leader 'safe-local-variable '(lambda (x) (or (memq x '(t nil allout-mode-leaders comment-start)) (stringp x)))) +(put 'allout-use-mode-specific-leader 'safe-local-variable (lambda (x) (or (memq x '(t nil allout-mode-leaders comment-start)) (stringp x)))) -(put 'allout-old-style-prefixes 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) +(put 'allout-old-style-prefixes 'safe-local-variable (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) -(put 'allout-stylish-prefixes 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) +(put 'allout-stylish-prefixes 'safe-local-variable (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) -(put 'allout-numbered-bullet 'safe-local-variable (if (fboundp 'string-or-null-p) 'string-or-null-p '(lambda (x) (or (stringp x) (null x))))) +(put 'allout-numbered-bullet 'safe-local-variable (if (fboundp 'string-or-null-p) 'string-or-null-p (lambda (x) (or (stringp x) (null x))))) -(put 'allout-file-xref-bullet 'safe-local-variable (if (fboundp 'string-or-null-p) 'string-or-null-p '(lambda (x) (or (stringp x) (null x))))) +(put 'allout-file-xref-bullet 'safe-local-variable (if (fboundp 'string-or-null-p) 'string-or-null-p (lambda (x) (or (stringp x) (null x))))) (put 'allout-presentation-padding 'safe-local-variable 'integerp) -(put 'allout-layout 'safe-local-variable '(lambda (x) (or (numberp x) (listp x) (memq x '(: * + -))))) +(put 'allout-layout 'safe-local-variable (lambda (x) (or (numberp x) (listp x) (memq x '(: * + -))))) (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp) @@ -844,7 +844,7 @@ for details on preparing emacs for automatic allout activation. ;;;### (autoloads (allout-widgets-mode allout-widgets-auto-activation ;;;;;; allout-widgets-setup allout-widgets) "allout-widgets" "allout-widgets.el" -;;;;;; (19859 11635)) +;;;;;; (19931 11784)) ;;; Generated autoloads from allout-widgets.el (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads)))) @@ -873,7 +873,7 @@ See `allout-widgets-mode' for allout widgets mode features.") (custom-autoload 'allout-widgets-auto-activation "allout-widgets" nil) -(put 'allout-widgets-mode-inhibit 'safe-local-variable (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) +(put 'allout-widgets-mode-inhibit 'safe-local-variable (if (fboundp 'booleanp) 'booleanp (lambda (x) (member x '(t nil))))) (autoload 'allout-widgets-mode "allout-widgets" "\ Allout-mode extension, providing graphical decoration of outline structure. @@ -903,7 +903,7 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (19845 45374)) +;;;;;; "net/ange-ftp.el" (19931 11784)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -1015,7 +1015,7 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** ;;;### (autoloads (appt-activate appt-add) "appt" "calendar/appt.el" -;;;;;; (19885 24894)) +;;;;;; (19922 19303)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1038,7 +1038,7 @@ ARG is positive, otherwise off. ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (19891 63700)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (19909 7240)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1233,8 +1233,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (19914 +;;;;;; 25180)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1586,7 +1586,7 @@ insert a template for the file depending on the mode of the buffer. ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (19863 8742)) +;;;;;; (19924 47209)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1594,30 +1594,42 @@ insert a template for the file depending on the mode of the buffer. (put 'generated-autoload-load-name 'safe-local-variable 'stringp) (autoload 'update-file-autoloads "autoload" "\ -Update the autoloads for FILE in `generated-autoload-file' -\(which FILE might bind in its local variables). -If SAVE-AFTER is non-nil (which is always, when called interactively), -save the buffer too. +Update the autoloads for FILE. +If prefix arg SAVE-AFTER is non-nil, save the buffer too. + +If FILE binds `generated-autoload-file' as a file-local variable, +autoloads are written into that file. Otherwise, the autoloads +file is determined by OUTFILE. If called interactively, prompt +for OUTFILE; if called from Lisp with OUTFILE nil, use the +existing value of `generated-autoload-file'. Return FILE if there was no autoload cookie in it, else nil. -\(fn FILE &optional SAVE-AFTER)" t nil) +\(fn FILE &optional SAVE-AFTER OUTFILE)" t nil) (autoload 'update-directory-autoloads "autoload" "\ -Update loaddefs.el with all the current autoloads from DIRS, and no old ones. -This uses `update-file-autoloads' (which see) to do its work. -In an interactive call, you must give one argument, the name -of a single directory. In a call from Lisp, you can supply multiple +Update autoload definitions for Lisp files in the directories DIRS. +In an interactive call, you must give one argument, the name of a +single directory. In a call from Lisp, you can supply multiple directories as separate arguments, but this usage is discouraged. The function does NOT recursively descend into subdirectories of the directory or directories specified. +In an interactive call, prompt for a default output file for the +autoload definitions, and temporarily bind the variable +`generated-autoload-file' to this value. When called from Lisp, +use the existing value of `generated-autoload-file'. If any Lisp +file binds `generated-autoload-file' as a file-local variable, +write its autoloads into the specified file instead. + \(fn &rest DIRS)" t nil) (autoload 'batch-update-autoloads "autoload" "\ Update loaddefs.el autoloads in batch mode. Calls `update-directory-autoloads' on the command line arguments. +Definitions are written to `generated-autoload-file' (which +should be non-nil). \(fn)" nil nil) @@ -1812,7 +1824,7 @@ For non-interactive use see also `benchmark-run' and ;;;*** ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize) -;;;;;; "bibtex" "textmodes/bibtex.el" (19845 45374)) +;;;;;; "bibtex" "textmodes/bibtex.el" (19931 11784)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1840,7 +1852,7 @@ new entry with the command \\[bibtex-clean-entry]. Some features of BibTeX mode are available only by setting the variable `bibtex-maintain-sorted-entries' to non-nil. However, then BibTeX mode -works only with buffers containing valid (syntactical correct) and sorted +works only with buffers containing valid (syntactically correct) and sorted entries. This is usually the case, if you have created a buffer completely with BibTeX mode and finished every new entry with \\[bibtex-clean-entry]. @@ -1862,7 +1874,7 @@ the name of a field with \\[bibtex-remove-OPT-or-ALT]. \\[bibtex-remove-delimiters] removes the double-quotes or braces around the text of the current field. \\[bibtex-empty-field] replaces the text of the current field with the default \"\" or {}. \\[bibtex-find-text] moves point to the end of the current field. -\\[bibtex-complete] completes word fragment before point according to context. +\\[completion-at-point] completes word fragment before point according to context. The command \\[bibtex-clean-entry] cleans the current entry, i.e. it removes OPT/ALT from the names of all non-empty optional or alternative fields, checks that @@ -2058,7 +2070,7 @@ a reflection. ;;;;;; bookmark-save bookmark-write bookmark-delete bookmark-insert ;;;;;; bookmark-rename bookmark-insert-location bookmark-relocate ;;;;;; bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark" -;;;;;; "bookmark.el" (19845 45374)) +;;;;;; "bookmark.el" (19914 25180)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2259,7 +2271,7 @@ Incremental search of bookmarks, hiding the non-matches as we go. ;;;;;; browse-url-at-mouse browse-url-at-point browse-url browse-url-of-region ;;;;;; browse-url-of-dired-file browse-url-of-buffer browse-url-of-file ;;;;;; browse-url-browser-function) "browse-url" "net/browse-url.el" -;;;;;; (19870 57559)) +;;;;;; (19911 48973)) ;;; Generated autoloads from net/browse-url.el (defvar 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)) "\ @@ -2664,7 +2676,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19881 27850)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19940 49234)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2918,8 +2930,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (calculator) "calculator" "calculator.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -2930,8 +2942,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19885 -;;;;;; 24894)) +;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19923 +;;;;;; 40175)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3046,9 +3058,9 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode -;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (19845 45374)) +;;;### (autoloads (awk-mode pike-mode idl-mode java-mode objc-mode +;;;;;; c++-mode c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" +;;;;;; (19938 7518)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3205,6 +3217,23 @@ Key bindings: (add-to-list 'interpreter-mode-alist '("gawk" . awk-mode)) (autoload 'awk-mode "cc-mode" "Major mode for editing AWK code." t) +(autoload 'awk-mode "cc-mode" "\ +Major mode for editing AWK code. +To submit a problem report, enter `\\[c-submit-bug-report]' from an +awk-mode buffer. This automatically sets up a mail buffer with version +information already added. You just need to add a description of the +problem, including a reproducible test case, and send the message. + +To see what version of CC Mode you are running, enter `\\[c-version]'. + +The hook `c-mode-common-hook' is run with no args at mode +initialization, then `awk-mode-hook'. + +Key bindings: +\\{awk-mode-map} + +\(fn)" t nil) + ;;;*** ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles" @@ -3560,7 +3589,7 @@ to the action header. ;;;*** ;;;### (autoloads (check-declare-directory check-declare-file) "check-declare" -;;;;;; "emacs-lisp/check-declare.el" (19845 45374)) +;;;;;; "emacs-lisp/check-declare.el" (19906 31087)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3585,7 +3614,7 @@ Returns non-nil if any false statements are found. ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p) -;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19845 45374)) +;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19931 11784)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp) (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp) @@ -3873,7 +3902,7 @@ a future Emacs interpreter will be able to use it.") ;;;*** ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el" -;;;;;; (19845 45374)) +;;;;;; (19918 22236)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -3886,7 +3915,7 @@ indentation function is called, and STATE is the of this function. If the indentation point is in a call to a Lisp function, that -function's common-lisp-indent-function property specifies how +function's `common-lisp-indent-function' property specifies how this function should indent it. Possible values for this property are: @@ -4016,7 +4045,7 @@ If FRAME cannot display COLOR, return nil. ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (19888 1100)) +;;;;;; (19931 11784)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4148,8 +4177,8 @@ on third call it again advances points to the next difference and so on. ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19890 -;;;;;; 42850)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19913 +;;;;;; 4309)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4573,7 +4602,7 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (19845 45374)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (19931 11784)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -5401,8 +5430,8 @@ Create a new data-debug buffer with NAME. ;;;*** -;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5543,7 +5572,7 @@ There is some minimal font-lock support (see vars ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (19845 45374)) +;;;;;; "emacs-lisp/debug.el" (19942 4565)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger 'debug) @@ -6035,7 +6064,7 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (19885 24894)) +;;;;;; "calendar/diary-lib.el" (19923 40175)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6078,7 +6107,7 @@ Major mode for editing the diary file. ;;;*** ;;;### (autoloads (diff-buffer-with-file diff-backup diff diff-command -;;;;;; diff-switches) "diff" "vc/diff.el" (19845 45374)) +;;;;;; diff-switches) "diff" "vc/diff.el" (19903 54862)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6122,7 +6151,7 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (19863 8742)) +;;;;;; (19930 13389)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6162,7 +6191,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (19886 46089)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (19927 37312)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6311,8 +6340,8 @@ function `dirtrack-debug-mode' to turn on debugging output. ;;;*** -;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19863 -;;;;;; 8742)) +;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload 'disassemble "disass" "\ @@ -6514,8 +6543,8 @@ Locate SOA record and increment the serial field. ;;;*** ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe -;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19872 -;;;;;; 12877)) +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19913 +;;;;;; 4309)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -7331,7 +7360,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19845 45374)) +;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (19914 25180)) ;;; Generated autoloads from cedet/ede.el (defvar global-ede-mode nil "\ @@ -7686,7 +7715,7 @@ Display Ediff's registry. ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "vc/ediff-util.el" (19845 45374)) +;;;;;; "ediff-util" "vc/ediff-util.el" (19931 11784)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7996,7 +8025,7 @@ displayed. ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (19845 45374)) +;;;;;; (19942 4565)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8425,7 +8454,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" -;;;;;; "erc/erc.el" (19895 48172)) +;;;;;; "erc/erc.el" (19903 54862)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8786,8 +8815,8 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19899 -;;;;;; 57784)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19936 +;;;;;; 52203)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) @@ -9048,7 +9077,7 @@ corresponding to a successful execution. ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (19893 19022)) +;;;;;; (19936 52203)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9532,7 +9561,7 @@ With ARG, insert that many delimiters. ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from net/eudc.el (autoload 'eudc-set-server "eudc" "\ @@ -9624,7 +9653,7 @@ Display a button for the JPEG DATA. ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (19845 45374)) +;;;;;; "eudc-export" "net/eudc-export.el" (19931 11784)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9641,7 +9670,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9773,7 +9802,7 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19882 48702)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19931 11784)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -9980,7 +10009,7 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (19845 45374)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (19931 11784)) ;;; Generated autoloads from mail/feedmail.el (autoload 'feedmail-send-it "feedmail" "\ @@ -10649,7 +10678,7 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (19865 50420)) +;;;;;; "flyspell" "textmodes/flyspell.el" (19931 11784)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -10792,8 +10821,8 @@ in your `~/.emacs' file, replacing [f7] by your favourite key: ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (19913 +;;;;;; 4309)) ;;; Generated autoloads from mail/footnote.el (autoload 'footnote-mode "footnote" "\ @@ -10844,7 +10873,7 @@ Visit a file in Forms mode in other window. ;;;*** ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el" -;;;;;; (19890 42850)) +;;;;;; (19905 10215)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -10922,7 +10951,7 @@ with no args, if that value is non-nil. ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (19889 21967)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (19931 11784)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -10971,7 +11000,7 @@ and choose the directory as the fortune-file. ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (19890 42850)) +;;;;;; (19931 11784)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11110,7 +11139,7 @@ regular expression that can be used as an element of ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (19890 42850)) +;;;;;; (19906 31087)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11179,7 +11208,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19889 21967)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19931 11784)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11232,7 +11261,7 @@ prompt the user for the name of an NNTP server to use. ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (19860 32495)) +;;;;;; "gnus/gnus-agent.el" (19903 54862)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11323,7 +11352,7 @@ If CLEAN, obsolete (ignore). ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (19874 54611)) +;;;;;; (19931 34253)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11402,7 +11431,7 @@ supported. ;;;*** ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article) -;;;;;; "gnus-delay" "gnus/gnus-delay.el" (19845 45374)) +;;;;;; "gnus-delay" "gnus/gnus-delay.el" (19931 11784)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload 'gnus-delay-article "gnus-delay" "\ @@ -11541,7 +11570,7 @@ If gravatars are already displayed, remove them. ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (19845 45374)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (19940 49234)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -11559,7 +11588,7 @@ Pop up a frame and enter GROUP. ;;;*** ;;;### (autoloads (gnus-html-prefetch-images gnus-article-html) "gnus-html" -;;;;;; "gnus/gnus-html.el" (19845 45374)) +;;;;;; "gnus/gnus-html.el" (19917 1372)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -11837,7 +11866,7 @@ Add NUM into sorted LIST by side effect. ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (19893 19022)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (19942 4565)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -11893,7 +11922,7 @@ Update the format specification near point. ;;;*** ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" -;;;;;; (19877 30798)) +;;;;;; (19906 31087)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -11904,7 +11933,7 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (19890 42850)) +;;;;;; (19942 4565)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12027,7 +12056,7 @@ Retrieve MAIL-ADDRESS gravatar and returns it. ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (19864 29553)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (19930 13389)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12198,7 +12227,7 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19890 42850)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19931 11784)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12507,7 +12536,7 @@ different regions. With numeric argument ARG, behaves like ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories ;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 ;;;;;; find-lisp-object-file-name help-C-file-name describe-function) -;;;;;; "help-fns" "help-fns.el" (19878 51661)) +;;;;;; "help-fns" "help-fns.el" (19938 7518)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -12984,7 +13013,7 @@ how the hiding is done: ;;;*** ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (19890 42850)) +;;;;;; (19938 7518)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13046,8 +13075,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-remove-highlight highlight-changes-visible-mode -;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19886 -;;;;;; 45771)) +;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13677,8 +13706,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19874 -;;;;;; 54611)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19940 +;;;;;; 49234)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -13740,7 +13769,7 @@ with no args, if that value is non-nil. ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -13900,8 +13929,8 @@ The main features of this mode are ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19886 -;;;;;; 45771)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14162,7 +14191,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (19886 45771)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (19931 11784)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names (purecopy "*ielm*")) @@ -14191,7 +14220,7 @@ Toggle inline image minor mode. ;;;;;; put-image create-image image-type-auto-detected-p image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (19849 29307)) +;;;;;; (19939 28373)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -14368,7 +14397,7 @@ Example: (put 'defimage 'doc-string-elt '3) (autoload 'create-animated-image "image" "\ -Create an animated image. +Create an animated image, and begin animating it. FILE-OR-DATA is an image file name or image data. Optional TYPE is a symbol describing the image type. If TYPE is omitted or nil, try to determine the image type from its first few bytes @@ -14384,7 +14413,13 @@ Images should not be larger than specified by `max-image-size'. \(fn FILE-OR-DATA &optional TYPE DATA-P &rest PROPS)" nil nil) (autoload 'imagemagick-register-types "image" "\ -Register the file types that ImageMagick is able to handle. +Register file types that can be handled by ImageMagick. +This adds the file types returned by `imagemagick-types' +\(excluding the ones in `imagemagick-types-inhibit') to +`auto-mode-alist' and `image-type-file-name-regexps', so that +Emacs visits them in Image mode. + +If Emacs is compiled without ImageMagick support, do nothing. \(fn)" nil nil) @@ -14397,7 +14432,7 @@ Register the file types that ImageMagick is able to handle. ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (19886 45771)) +;;;;;; "image-dired" "image-dired.el" (19931 11784)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -14597,7 +14632,7 @@ Image files are those whose name has an extension in ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (19890 42850)) +;;;;;; image-mode) "image-mode" "image-mode.el" (19939 28373)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15042,7 +15077,7 @@ Go to Info buffer that displays MANUAL, creating it if none already exists. ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (19845 45374)) +;;;;;; (19936 52203)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15361,7 +15396,7 @@ Add submenus to the File menu, to convert to and from various formats. ;;;;;; ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary) -;;;;;; "ispell" "textmodes/ispell.el" (19845 45374)) +;;;;;; "ispell" "textmodes/ispell.el" (19905 10215)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -15581,8 +15616,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19886 -;;;;;; 45771)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -15708,7 +15743,7 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19890 42850)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19914 25180)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16096,7 +16131,7 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el" -;;;;;; (19845 45374)) +;;;;;; (19917 1372)) ;;; Generated autoloads from progmodes/ld-script.el (autoload 'ld-script-mode "ld-script" "\ @@ -16339,8 +16374,8 @@ are indicated with a symbol. ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (19845 -;;;;;; 45374)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (19909 +;;;;;; 7240)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt))) @@ -16472,7 +16507,7 @@ A major mode to edit m4 macro files. ;;;*** ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el" -;;;;;; (19863 8742)) +;;;;;; (19930 13389)) ;;; Generated autoloads from emacs-lisp/macroexp.el (autoload 'macroexpand-all "macroexp" "\ @@ -16639,7 +16674,7 @@ This function normally would be called when the message is sent. ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region ;;;;;; mail-unquote-printable mail-quote-printable-region mail-quote-printable ;;;;;; mail-file-babyl-p mail-dont-reply-to-names mail-use-rfc822) -;;;;;; "mail-utils" "mail/mail-utils.el" (19845 45374)) +;;;;;; "mail-utils" "mail/mail-utils.el" (19922 19303)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17059,7 +17094,7 @@ Returns non-nil if the new state is enabled. ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (19881 27850)) +;;;;;; "gnus/message.el" (19940 49234)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17377,7 +17412,7 @@ delete the draft message. ;;;*** -;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19898 36953)) +;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19931 11784)) ;;; Generated autoloads from mh-e/mh-e.el (put 'mh-progs 'risky-local-variable t) @@ -17530,7 +17565,8 @@ Returns non-nil if the new state is enabled. ;;;*** -;;;### (autoloads (butterfly) "misc" "misc.el" (19845 45374)) +;;;### (autoloads (list-dynamic-libraries butterfly) "misc" "misc.el" +;;;;;; (19913 4309)) ;;; Generated autoloads from misc.el (autoload 'butterfly "misc" "\ @@ -17545,6 +17581,17 @@ variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'. \(fn)" t nil) +(autoload 'list-dynamic-libraries "misc" "\ +Display a list of all dynamic libraries known to Emacs. +\(These are the libraries listed in `dynamic-library-alist'.) +If optional argument LOADED-ONLY-P (interactively, prefix arg) +is non-nil, only libraries already loaded are listed. +Optional argument BUFFER specifies a buffer to use, instead of +\"*Dynamic Libraries*\". +The return value is always nil. + +\(fn &optional LOADED-ONLY-P BUFFER)" t nil) + ;;;*** ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files @@ -17631,7 +17678,7 @@ whose file names match the specified wildcard. ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload 'mixal-mode "mixal-mode" "\ @@ -17712,7 +17759,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el" -;;;;;; (19845 45374)) +;;;;;; (19940 49234)) ;;; Generated autoloads from gnus/mml1991.el (autoload 'mml1991-encrypt "mml1991" "\ @@ -17950,7 +17997,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (19845 45374)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (19931 11784)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18363,7 +18410,7 @@ listed in the PORTS list. ;;;*** ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el" -;;;;;; (19893 19022)) +;;;;;; (19906 31087)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -18427,6 +18474,9 @@ values: capability command, and should return the command to switch on STARTTLS if the server supports STARTTLS, and nil otherwise. +:nowait is a boolean that says the connection should be made +asynchronously, if possible. + \(fn NAME BUFFER HOST SERVICE &rest PARAMETERS)" nil nil) (defalias 'open-protocol-stream 'open-network-stream) @@ -18438,7 +18488,7 @@ values: ;;;;;; uncomment-region comment-kill comment-set-column comment-indent ;;;;;; comment-indent-default comment-normalize-vars comment-multi-line ;;;;;; comment-padding comment-style comment-column) "newcomment" -;;;;;; "newcomment.el" (19863 8742)) +;;;;;; "newcomment.el" (19938 7518)) ;;; Generated autoloads from newcomment.el (defalias 'indent-for-comment 'comment-indent) @@ -18477,7 +18527,7 @@ at the place matched by the close of the first pair.") (put 'comment-start-skip 'safe-local-variable 'string-or-null-p) (defvar comment-end-skip nil "\ -Regexp to match the end of a comment plus everything up to its body.") +Regexp to match the end of a comment plus everything back to its body.") (put 'comment-end-skip 'safe-local-variable 'string-or-null-p) (defvar comment-end (purecopy "") "\ @@ -18638,7 +18688,7 @@ unless optional argument SOFT is non-nil. ;;;*** ;;;### (autoloads (newsticker-start newsticker-running-p) "newst-backend" -;;;;;; "net/newst-backend.el" (19845 45374)) +;;;;;; "net/newst-backend.el" (19918 22236)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -18660,7 +18710,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el" -;;;;;; (19845 45374)) +;;;;;; (19918 22236)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -18671,7 +18721,7 @@ Start newsticker plainview. ;;;*** ;;;### (autoloads (newsticker-show-news) "newst-reader" "net/newst-reader.el" -;;;;;; (19845 45374)) +;;;;;; (19918 22236)) ;;; Generated autoloads from net/newst-reader.el (autoload 'newsticker-show-news "newst-reader" "\ @@ -18703,7 +18753,7 @@ running already. ;;;*** ;;;### (autoloads (newsticker-treeview) "newst-treeview" "net/newst-treeview.el" -;;;;;; (19845 45374)) +;;;;;; (19918 22236)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -18823,8 +18873,8 @@ Return nil if the face cannot display a glyph for N. ;;;*** -;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (19927 +;;;;;; 37225)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19279,7 +19329,7 @@ including a reproducible test case and send the message. ;;;;;; org-insert-link-global org-store-link org-run-like-in-org-mode ;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle ;;;;;; org-mode org-babel-do-load-languages) "org" "org/org.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19502,7 +19552,7 @@ Call the customize function with org as argument. ;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda -;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (19845 45374)) +;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (19914 25180)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-agenda "org-agenda" "\ @@ -19772,8 +19822,8 @@ This command is set with the variable `org-archive-default-command'. ;;;### (autoloads (org-export-as-ascii org-export-region-as-ascii ;;;;;; org-replace-region-by-ascii org-export-as-ascii-to-buffer ;;;;;; org-export-as-utf8-to-buffer org-export-as-utf8 org-export-as-latin1-to-buffer -;;;;;; org-export-as-latin1) "org-ascii" "org/org-ascii.el" (19845 -;;;;;; 45374)) +;;;;;; org-export-as-latin1) "org-ascii" "org/org-ascii.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from org/org-ascii.el (autoload 'org-export-as-latin1 "org-ascii" "\ @@ -19846,8 +19896,8 @@ publishing directory. ;;;*** -;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from org/org-attach.el (autoload 'org-attach "org-attach" "\ @@ -20019,7 +20069,7 @@ publishing directory. ;;;### (autoloads (org-insert-export-options-template org-export-as-org ;;;;;; org-export-visible org-export) "org-exp" "org/org-exp.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from org/org-exp.el (autoload 'org-export "org-exp" "\ @@ -20193,7 +20243,7 @@ Convert FreeMind file MM-FILE to `org-mode' file ORG-FILE. ;;;### (autoloads (org-export-htmlize-generate-css org-export-as-html ;;;;;; org-export-region-as-html org-replace-region-by-html org-export-as-html-to-buffer ;;;;;; org-export-as-html-batch org-export-as-html-and-open) "org-html" -;;;;;; "org/org-html.el" (19845 45374)) +;;;;;; "org/org-html.el" (19931 11784)) ;;; Generated autoloads from org/org-html.el (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp) @@ -20642,7 +20692,7 @@ See also the variable `org-reverse-note-order'. ;;;*** ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl) -;;;;;; "org-table" "org/org-table.el" (19845 45374)) +;;;;;; "org-table" "org/org-table.el" (19914 25180)) ;;; Generated autoloads from org/org-table.el (autoload 'turn-on-orgtbl "org-table" "\ @@ -21194,8 +21244,8 @@ Includes files as well as host names followed by a colon. ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19899 -;;;;;; 57784)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -21337,7 +21387,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (19890 42850)) +;;;;;; (19911 48973)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -21507,7 +21557,7 @@ pong-mode keybindings:\\<pong-mode-map> ;;;*** -;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (19845 45374)) +;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (19940 49234)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -22290,8 +22340,8 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (19886 -;;;;;; 45771)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\ @@ -22488,7 +22538,7 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (19890 42850)) +;;;;;; (19931 11784)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode)) @@ -22591,7 +22641,7 @@ them into characters should be done separately. ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (19845 45374)) +;;;;;; "international/quail.el" (19931 11784)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22895,7 +22945,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (19898 36953)) +;;;;;; "net/rcirc.el" (19942 4565)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22912,7 +22962,7 @@ If ARG is non-nil, instead prompt for connection parameters. (autoload 'rcirc-connect "rcirc" "\ -\(fn SERVER &optional PORT NICK USER-NAME FULL-NAME STARTUP-CHANNELS PASSWORD)" nil nil) +\(fn SERVER &optional PORT NICK USER-NAME FULL-NAME STARTUP-CHANNELS PASSWORD ENCRYPTION)" nil nil) (defvar rcirc-track-minor-mode nil "\ Non-nil if Rcirc-Track minor mode is enabled. @@ -22943,13 +22993,19 @@ See \\[compile]. ;;;*** ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (19865 50420)) +;;;;;; (19938 7518)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) (autoload 're-builder "re-builder" "\ Construct a regexp interactively. +This command makes the current buffer the \"target\" buffer of +the regexp builder. It displays a buffer named \"*RE-Builder*\" +in another window, initially containing an empty regexp. + +As you edit the regexp in the \"*RE-Builder*\" buffer, the +matching parts of the target buffer will be highlighted. \(fn)" t nil) @@ -23837,8 +23893,8 @@ to use for finding the schema. ;;;*** -;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (rng-xsd-compile) "rng-xsd" "nxml/rng-xsd.el" (19930 +;;;;;; 13389)) ;;; Generated autoloads from nxml/rng-xsd.el (put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile 'rng-xsd-compile) @@ -23937,7 +23993,7 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el" -;;;;;; (19845 45374)) +;;;;;; (19932 55155)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -24500,7 +24556,7 @@ Semantic mode. ;;;;;; mail-yank-prefix mail-setup-hook mail-personal-alias-file ;;;;;; mail-default-reply-to mail-archive-file-name mail-header-separator ;;;;;; send-mail-function mail-interactive mail-self-blind mail-specify-envelope-from -;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (19881 27850)) +;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (19935 31309)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24543,9 +24599,9 @@ Otherwise, let mailer send back a message to report errors.") (custom-autoload 'mail-interactive "sendmail" t) -(put 'send-mail-function 'standard-value '((if (and window-system (memq system-type '(darwin windows-nt))) 'mailclient-send-it 'sendmail-send-it))) +(put 'send-mail-function 'standard-value '((if (or (and window-system (eq system-type 'darwin)) (eq system-type 'windows-nt)) 'mailclient-send-it 'sendmail-send-it))) -(defvar send-mail-function (if (and window-system (memq system-type '(darwin windows-nt))) 'mailclient-send-it 'sendmail-send-it) "\ +(defvar send-mail-function (if (or (and window-system (eq system-type 'darwin)) (eq system-type 'windows-nt)) 'mailclient-send-it 'sendmail-send-it) "\ Function to call to send the current buffer as mail. The headers should be delimited by a line which is not a valid RFC822 header or continuation line, @@ -24779,8 +24835,8 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (19863 -;;;;;; 8742)) +;;;;;; server-force-delete server-start) "server" "server.el" (19902 +;;;;;; 34006)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24992,20 +25048,6 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads (sha1) "sha1" "sha1.el" (19845 45374)) -;;; Generated autoloads from sha1.el - -(autoload 'sha1 "sha1" "\ -Return the SHA1 (Secure Hash Algorithm) of an object. -OBJECT is either a string or a buffer. -Optional arguments BEG and END denote buffer positions for computing the -hash of a portion of OBJECT. -If BINARY is non-nil, return a string in binary form. - -\(fn OBJECT &optional BEG END BINARY)" nil nil) - -;;;*** - ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el" ;;;;;; (19845 45374)) ;;; Generated autoloads from emacs-lisp/shadow.el @@ -25097,7 +25139,7 @@ Set up file shadowing. ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (19888 1100)) +;;;;;; (19935 983)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -25146,8 +25188,8 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** -;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19899 -;;;;;; 57784)) +;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19942 +;;;;;; 4565)) ;;; Generated autoloads from gnus/shr.el (autoload 'shr-insert-document "shr" "\ @@ -25354,7 +25396,7 @@ symmetrical ones, and the same character twice for the others. ;;;*** ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff) -;;;;;; "smerge-mode" "vc/smerge-mode.el" (19863 8742)) +;;;;;; "smerge-mode" "vc/smerge-mode.el" (19931 11784)) ;;; Generated autoloads from vc/smerge-mode.el (autoload 'smerge-ediff "smerge-mode" "\ @@ -25379,7 +25421,7 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (19845 45374)) +;;;;;; (19939 28373)) ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -25397,7 +25439,7 @@ interactively. If there's no argument, do it at the current buffer. ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (19845 45374)) +;;;;;; "mail/smtpmail.el" (19940 49234)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -25807,7 +25849,7 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-connect ;;;;;; sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el" -;;;;;; (19890 42850)) +;;;;;; (19931 11784)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -26523,7 +26565,7 @@ See `subword-mode' for more information on Subword mode. ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from mail/supercite.el (autoload 'sc-cite-original "supercite" "\ @@ -27364,7 +27406,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -27406,8 +27448,8 @@ use in that buffer. ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19886 -;;;;;; 45771)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19931 +;;;;;; 11784)) ;;; Generated autoloads from terminal.el (autoload 'terminal-emulator "terminal" "\ @@ -27942,7 +27984,7 @@ Compose Thai characters in the current buffer. ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (19852 16697)) +;;;;;; "thingatpt" "thingatpt.el" (19918 22236)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27999,7 +28041,7 @@ Return the Lisp list at point, or nil if none is found. ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked ;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -28360,7 +28402,7 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el" -;;;;;; (19845 45374)) +;;;;;; (19909 7240)) ;;; Generated autoloads from calendar/timeclock.el (autoload 'timeclock-modeline-display "timeclock" "\ @@ -28654,7 +28696,7 @@ holds a keymap. ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -28766,7 +28808,7 @@ BUFFER defaults to `trace-buffer'. ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (19894 39890)) +;;;;;; "net/tramp.el" (19924 47209)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28904,7 +28946,7 @@ Discard Tramp from loading remote files. ;;;*** ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -29002,7 +29044,7 @@ First column's text sSs Second column's text ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (19886 45771)) +;;;;;; (19919 43103)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -29762,6 +29804,20 @@ Setup variables that expose info about you and your system. ;;;*** +;;;### (autoloads (url-queue-retrieve) "url-queue" "url/url-queue.el" +;;;;;; (19942 4565)) +;;; Generated autoloads from url/url-queue.el + +(autoload 'url-queue-retrieve "url-queue" "\ +Retrieve URL asynchronously and call CALLBACK with CBARGS when finished. +Like `url-retrieve' (which see for details of the arguments), but +controls the level of parallelism via the +`url-queue-parallel-processes' variable. + +\(fn URL CALLBACK &optional CBARGS SILENT)" nil nil) + +;;;*** + ;;;### (autoloads (url-view-url url-truncate-url-for-viewing url-file-extension ;;;;;; url-hexify-string url-unhex-string url-parse-query-string ;;;;;; url-file-nondirectory url-file-directory url-percentage url-display-percentage @@ -30285,7 +30341,7 @@ Return the branch part of a revision number REV. ;;;*** ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el" -;;;;;; (19893 19022)) +;;;;;; (19920 63959)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -30332,7 +30388,7 @@ mode-specific menu. `vc-annotate-color-map' and ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (19845 45374)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (19931 34253)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ @@ -30357,7 +30413,7 @@ Name of the directory containing Bzr repository status files.") ;;;*** -;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (19845 45374)) +;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (19930 13389)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -30545,7 +30601,7 @@ Key bindings: ;;;*** ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30682,7 +30738,7 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (19845 45374)) +;;;;;; (19914 25180)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -31589,7 +31645,7 @@ Turn on VIP emulation of VI. ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (19845 45374)) +;;;;;; (19931 11784)) ;;; Generated autoloads from emulation/viper.el (autoload 'toggle-viper-mode "viper" "\ @@ -31606,7 +31662,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" -;;;;;; (19845 45374)) +;;;;;; (19906 31087)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -31623,7 +31679,7 @@ Non-nil means treat multiple `display-warning' calls as a series. A marker indicates a position in the warnings buffer which is the start of the current series; it means that additional warnings in the same buffer should not move point. -t means the next warning begins a series (and stores a marker here). +If t, the next warning begins a series (and stores a marker here). A symbol with a function definition is like t, except also call that function before the next warning.") @@ -31696,7 +31752,7 @@ this is equivalent to `display-warning', using ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (19886 45771)) +;;;;;; (19913 4309)) ;;; Generated autoloads from wdired.el (autoload 'wdired-change-to-wdired-mode "wdired" "\ @@ -31712,7 +31768,7 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (19845 45374)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (19931 11784)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -31729,7 +31785,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el" -;;;;;; (19845 45374)) +;;;;;; (19915 46047)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31760,7 +31816,7 @@ and off otherwise. ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region ;;;;;; whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options ;;;;;; global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode -;;;;;; whitespace-mode) "whitespace" "whitespace.el" (19901 13134)) +;;;;;; whitespace-mode) "whitespace" "whitespace.el" (19905 10215)) ;;; Generated autoloads from whitespace.el (autoload 'whitespace-mode "whitespace" "\ @@ -32190,8 +32246,8 @@ With arg, turn widget mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19886 -;;;;;; 45771)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19927 +;;;;;; 37225)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -32620,46 +32676,47 @@ Zone out, completely. ;;;;;; "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el" ;;;;;; "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el" ;;;;;; "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el" -;;;;;; "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el" -;;;;;; "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el" -;;;;;; "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el" -;;;;;; "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el" -;;;;;; "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el" -;;;;;; "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el" -;;;;;; "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el" -;;;;;; "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el" -;;;;;; "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el" -;;;;;; "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el" -;;;;;; "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el" -;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" -;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el" -;;;;;; "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el" -;;;;;; "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el" -;;;;;; "cedet/cedet.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" -;;;;;; "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el" -;;;;;; "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el" -;;;;;; "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/locate.el" -;;;;;; "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" -;;;;;; "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" -;;;;;; "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" -;;;;;; "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" -;;;;;; "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el" -;;;;;; "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el" -;;;;;; "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el" -;;;;;; "cedet/ede/system.el" "cedet/ede/util.el" "cedet/inversion.el" -;;;;;; "cedet/mode-local.el" "cedet/pulse.el" "cedet/semantic/analyze.el" -;;;;;; "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el" -;;;;;; "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el" -;;;;;; "cedet/semantic/bovine.el" "cedet/semantic/bovine/c-by.el" -;;;;;; "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el" -;;;;;; "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el" -;;;;;; "cedet/semantic/bovine/make-by.el" "cedet/semantic/bovine/make.el" -;;;;;; "cedet/semantic/bovine/scm-by.el" "cedet/semantic/bovine/scm.el" -;;;;;; "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" -;;;;;; "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el" -;;;;;; "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" -;;;;;; "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el" -;;;;;; "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" +;;;;;; "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el" +;;;;;; "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el" +;;;;;; "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el" +;;;;;; "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el" +;;;;;; "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el" +;;;;;; "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el" +;;;;;; "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el" +;;;;;; "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el" +;;;;;; "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el" +;;;;;; "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el" +;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el" +;;;;;; "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el" +;;;;;; "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el" +;;;;;; "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el" +;;;;;; "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el" +;;;;;; "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/auto.el" +;;;;;; "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" "cedet/ede/cpp-root.el" +;;;;;; "cedet/ede/custom.el" "cedet/ede/dired.el" "cedet/ede/emacs.el" +;;;;;; "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el" +;;;;;; "cedet/ede/loaddefs.el" "cedet/ede/locate.el" "cedet/ede/make.el" +;;;;;; "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" "cedet/ede/pmake.el" +;;;;;; "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" +;;;;;; "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" +;;;;;; "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" +;;;;;; "cedet/ede/proj-shared.el" "cedet/ede/proj.el" "cedet/ede/project-am.el" +;;;;;; "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el" +;;;;;; "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el" +;;;;;; "cedet/ede/util.el" "cedet/inversion.el" "cedet/mode-local.el" +;;;;;; "cedet/pulse.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el" +;;;;;; "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el" +;;;;;; "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el" +;;;;;; "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el" +;;;;;; "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el" +;;;;;; "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el" +;;;;;; "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el" +;;;;;; "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el" +;;;;;; "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el" +;;;;;; "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el" +;;;;;; "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el" +;;;;;; "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el" +;;;;;; "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el" ;;;;;; "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el" ;;;;;; "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el" ;;;;;; "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el" @@ -32667,13 +32724,13 @@ Zone out, completely. ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" -;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" -;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" -;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" -;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" -;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" -;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" -;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" +;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" +;;;;;; "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el" +;;;;;; "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el" +;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" +;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" +;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" @@ -32685,32 +32742,33 @@ Zone out, completely. ;;;;;; "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el" ;;;;;; "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el" ;;;;;; "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el" -;;;;;; "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el" -;;;;;; "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el" -;;;;;; "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el" -;;;;;; "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el" -;;;;;; "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el" -;;;;;; "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" -;;;;;; "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el" -;;;;;; "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el" -;;;;;; "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el" -;;;;;; "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el" -;;;;;; "emacs-lisp/eieio-speedbar.el" "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" -;;;;;; "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" -;;;;;; "emacs-lisp/regi.el" "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el" -;;;;;; "emacs-lisp/tcover-unsafep.el" "emacs-lock.el" "emulation/cua-gmrk.el" -;;;;;; "emulation/cua-rect.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el" -;;;;;; "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-extras.el" -;;;;;; "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el" -;;;;;; "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el" -;;;;;; "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el" -;;;;;; "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el" -;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" -;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" -;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" -;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" -;;;;;; "eshell/em-term.el" "eshell/em-unix.el" "eshell/em-xtra.el" -;;;;;; "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el" +;;;;;; "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el" +;;;;;; "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" +;;;;;; "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el" +;;;;;; "cus-dep.el" "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" +;;;;;; "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el" +;;;;;; "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" +;;;;;; "emacs-lisp/byte-opt.el" "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el" +;;;;;; "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" +;;;;;; "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" +;;;;;; "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el" +;;;;;; "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el" +;;;;;; "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el" +;;;;;; "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/regi.el" +;;;;;; "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el" +;;;;;; "emacs-lock.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el" +;;;;;; "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el" +;;;;;; "emulation/edt-vt100.el" "emulation/tpu-extras.el" "emulation/viper-cmd.el" +;;;;;; "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el" +;;;;;; "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el" +;;;;;; "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el" +;;;;;; "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el" +;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" +;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" +;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" +;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" +;;;;;; "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el" +;;;;;; "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el" ;;;;;; "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el" ;;;;;; "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el" ;;;;;; "ezimage.el" "foldout.el" "format-spec.el" "forms-d2.el" @@ -32736,8 +32794,8 @@ Zone out, completely. ;;;;;; "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/rtree.el" "gnus/shr-color.el" ;;;;;; "gnus/sieve-manage.el" "gnus/smime.el" "gnus/spam-stat.el" ;;;;;; "gnus/spam-wash.el" "hex-util.el" "hfy-cmap.el" "ibuf-ext.el" -;;;;;; "international/charprop.el" "international/cp51932.el" "international/eucjp-ms.el" -;;;;;; "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el" +;;;;;; "international/cp51932.el" "international/eucjp-ms.el" "international/fontset.el" +;;;;;; "international/iso-ascii.el" "international/ja-dic-cnv.el" ;;;;;; "international/ja-dic-utl.el" "international/ogonek.el" "international/uni-bidi.el" ;;;;;; "international/uni-category.el" "international/uni-combining.el" ;;;;;; "international/uni-comment.el" "international/uni-decimal.el" @@ -32746,7 +32804,7 @@ Zone out, completely. ;;;;;; "international/uni-name.el" "international/uni-numeric.el" ;;;;;; "international/uni-old-name.el" "international/uni-titlecase.el" ;;;;;; "international/uni-uppercase.el" "json.el" "kermit.el" "language/hanja-util.el" -;;;;;; "language/thai-word.el" "ldefs-boot.el" "mail/blessmail.el" +;;;;;; "language/thai-word.el" "ldefs-boot.el" "loadup.el" "mail/blessmail.el" ;;;;;; "mail/mailheader.el" "mail/mailpost.el" "mail/mspools.el" ;;;;;; "mail/rfc2368.el" "mail/rfc822.el" "mail/rmail-spam-filter.el" ;;;;;; "mail/rmailedit.el" "mail/rmailkwd.el" "mail/rmailmm.el" @@ -32808,13 +32866,13 @@ Zone out, completely. ;;;;;; "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el" "timezone.el" ;;;;;; "tooltip.el" "tree-widget.el" "uniquify.el" "url/url-about.el" ;;;;;; "url/url-cookie.el" "url/url-dired.el" "url/url-expand.el" -;;;;;; "url/url-ftp.el" "url/url-history.el" "url/url-imap.el" "url/url-methods.el" -;;;;;; "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "vc/ediff-diff.el" -;;;;;; "vc/ediff-init.el" "vc/ediff-merg.el" "vc/ediff-ptch.el" -;;;;;; "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el" -;;;;;; "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el" -;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19901 -;;;;;; 13383 538856)) +;;;;;; "url/url-ftp.el" "url/url-future.el" "url/url-history.el" +;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" +;;;;;; "url/url-vars.el" "vc/ediff-diff.el" "vc/ediff-init.el" "vc/ediff-merg.el" +;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" +;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" +;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el" +;;;;;; "w32-vars.el" "x-dnd.el") (19942 4644 183664)) ;;;*** diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index ce4dde29693..6b062f2298f 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -331,6 +331,7 @@ usually do not have translators to read other languages for them.\n\n") ;; It's the default mail mode, so it seems OK to use its features. (autoload 'message-bogus-recipient-p "message") +(defvar message-send-mail-function) (defun report-emacs-bug-hook () "Do some checking before sending a bug report." @@ -343,6 +344,10 @@ usually do not have translators to read other languages for them.\n\n") report-emacs-bug-orig-text) (error "No text entered in bug report")) (or report-emacs-bug-no-confirmation + ;; mailclient.el does not handle From (at present). + (if (derived-mode-p 'message-mode) + (eq message-send-mail-function 'message-send-mail-with-mailclient) + (eq send-mail-function 'mailclient-send-it)) ;; Not narrowing to the headers, but that's OK. (let ((from (mail-fetch-field "From"))) (and (or (not from) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 60f3062ea7b..2c5fa014a94 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -470,7 +470,8 @@ by Emacs.)") (put 'mail-mailer-swallows-blank-line 'risky-local-variable t) ; gets evalled (make-obsolete-variable 'mail-mailer-swallows-blank-line - "no need to set this on any modern system." "24.1") + "no need to set this on any modern system." + "24.1" 'set) (defvar mail-mode-syntax-table ;; define-derived-mode will make it inherit from text-mode-syntax-table. diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 0f96f7905eb..03e8225f0c5 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -26,11 +26,15 @@ ;; internal use only. ;; Functional completion tables have an extended calling conventions: -;; - The `action' can be (additionally to nil, t, and lambda) of the form -;; (boundaries . SUFFIX) in which case it should return +;; The `action' can be (additionally to nil, t, and lambda) of the form +;; - (boundaries . SUFFIX) in which case it should return ;; (boundaries START . END). See `completion-boundaries'. ;; Any other return value should be ignored (so we ignore values returned ;; from completion tables that don't know about this new `action' form). +;; - `metadata' in which case it should return (metadata . ALIST) where +;; ALIST is the metadata of this table. See `completion-metadata'. +;; Any other return value should be ignored (so we ignore values returned +;; from completion tables that don't know about this new `action' form). ;;; Bugs: @@ -107,7 +111,8 @@ E.g. for simple completion tables, the result is always (0 . (length SUFFIX)) and for file names the result is the positions delimited by the closest directory separators." (let ((boundaries (if (functionp table) - (funcall table string pred (cons 'boundaries suffix))))) + (funcall table string pred + (cons 'boundaries suffix))))) (if (not (eq (car-safe boundaries) 'boundaries)) (setq boundaries nil)) (cons (or (cadr boundaries) 0) @@ -125,7 +130,8 @@ This metadata is an alist. Currently understood keys are: Takes one argument (COMPLETIONS) and should return a new list of completions. Can operate destructively. - `cycle-sort-function': function to sort entries when cycling. - Works like `display-sort-function'." + Works like `display-sort-function'. +The metadata of a completion table should be constant between two boundaries." (let ((metadata (if (functionp table) (funcall table string pred 'metadata)))) (if (eq (car-safe metadata) 'metadata) @@ -160,8 +166,8 @@ PRED is a completion predicate. ACTION can be one of nil, t or `lambda'." (cond ((functionp table) (funcall table string pred action)) - ((eq (car-safe action) 'boundaries) - (cons 'boundaries (completion-boundaries string table pred (cdr action)))) + ((eq (car-safe action) 'boundaries) nil) + ((eq action 'metadata) nil) (t (funcall (cond @@ -182,7 +188,7 @@ The result of the `completion-table-dynamic' form is a function that can be used as the COLLECTION argument to `try-completion' and `all-completions'. See Info node `(elisp)Programmed Completion'." (lambda (string pred action) - (if (eq (car-safe action) 'boundaries) + (if (or (eq (car-safe action) 'boundaries) (eq action 'metadata)) ;; `fun' is not supposed to return another function but a plain old ;; completion table, whose boundaries are always trivial. nil @@ -287,18 +293,18 @@ instead of a string, a function that takes the completion and returns the (funcall terminator comp) (concat comp terminator)) comp)))) - ((eq action t) + ;; completion-table-with-terminator is always used for + ;; "sub-completions" so it's only called if the terminator is missing, + ;; in which case `test-completion' should return nil. + ((eq action 'lambda) nil) + (t ;; FIXME: We generally want the `try' and `all' behaviors to be ;; consistent so pcm can merge the `all' output to get the `try' output, ;; but that sometimes clashes with the need for `all' output to look ;; good in *Completions*. ;; (mapcar (lambda (s) (concat s terminator)) ;; (all-completions string table pred)))) - (all-completions string table pred)) - ;; completion-table-with-terminator is always used for - ;; "sub-completions" so it's only called if the terminator is missing, - ;; in which case `test-completion' should return nil. - ((eq action 'lambda) nil))) + (complete-with-action action table string pred)))) (defun completion-table-with-predicate (table pred1 strict string pred2 action) "Make a completion table equivalent to TABLE but filtered through PRED1. @@ -769,22 +775,33 @@ scroll the window of possible completions." (setq completion-cycling nil) (setq completion-all-sorted-completions nil)) +(defun completion--metadata (string base md-at-point table pred) + ;; Like completion-metadata, but for the specific case of getting the + ;; metadata at `base', which tends to trigger pathological behavior for old + ;; completion tables which don't understand `metadata'. + (let ((bounds (completion-boundaries string table pred ""))) + (if (eq (car bounds) base) md-at-point + (completion-metadata (substring string 0 base) table pred)))) + (defun completion-all-sorted-completions () (or completion-all-sorted-completions (let* ((start (field-beginning)) (end (field-end)) (string (buffer-substring start end)) + (md (completion--field-metadata start)) (all (completion-all-completions string minibuffer-completion-table minibuffer-completion-predicate (- (point) start) - (completion--field-metadata start))) + md)) (last (last all)) (base-size (or (cdr last) 0)) - (all-md (completion-metadata (substring string 0 base-size) - minibuffer-completion-table - minibuffer-completion-predicate)) + (all-md (completion--metadata (buffer-substring-no-properties + start (point)) + base-size md + minibuffer-completion-table + minibuffer-completion-predicate)) (sort-fun (completion-metadata-get all-md 'cycle-sort-function))) (when last (setcdr last nil) @@ -1272,12 +1289,13 @@ variables.") (let* ((start (field-beginning)) (end (field-end)) (string (field-string)) + (md (completion--field-metadata start)) (completions (completion-all-completions string minibuffer-completion-table minibuffer-completion-predicate (- (point) (field-beginning)) - (completion--field-metadata start)))) + md))) (message nil) (if (or (null completions) (and (not (consp (cdr completions))) @@ -1293,12 +1311,11 @@ variables.") (let* ((last (last completions)) (base-size (cdr last)) (prefix (unless (zerop base-size) (substring string 0 base-size))) - ;; FIXME: This function is for the output of all-completions, - ;; not completion-all-completions. Often it's the same, but - ;; not always. - (all-md (completion-metadata (substring string 0 base-size) - minibuffer-completion-table - minibuffer-completion-predicate)) + (all-md (completion--metadata (buffer-substring-no-properties + start (point)) + base-size md + minibuffer-completion-table + minibuffer-completion-predicate)) (afun (or (completion-metadata-get all-md 'annotation-function) (plist-get completion-extra-properties :annotation-function) @@ -1640,6 +1657,34 @@ The completion method is determined by `completion-at-point-functions'." (define-key map "\t" 'exit-minibuffer) (define-key map "?" 'self-insert-and-exit)) +(defvar minibuffer-inactive-mode-map + (let ((map (make-keymap))) + (suppress-keymap map) + (define-key map "e" 'find-file-other-frame) + (define-key map "f" 'find-file-other-frame) + (define-key map "b" 'switch-to-buffer-other-frame) + (define-key map "i" 'info) + (define-key map "m" 'mail) + (define-key map "n" 'make-frame) + (define-key map [mouse-1] (lambda () (interactive) + (with-current-buffer "*Messages*" + (goto-char (point-max)) + (display-buffer (current-buffer))))) + ;; So the global down-mouse-1 binding doesn't clutter the execution of the + ;; above mouse-1 binding. + (define-key map [down-mouse-1] #'ignore) + map) + "Keymap for use in the minibuffer when it is not active. +The non-mouse bindings in this keymap can only be used in minibuffer-only +frames, since the minibuffer can normally not be selected when it is +not active.") + +(define-derived-mode minibuffer-inactive-mode nil "InactiveMinibuffer" + :abbrev-table nil ;abbrev.el is not loaded yet during dump. + ;; Note: this major mode is called from minibuf.c. + "Major mode to use in the minibuffer when it is not active. +This is only used when the minibuffer area has no active minibuffer.") + ;;; Completion tables. (defun minibuffer--double-dollars (str) @@ -1673,8 +1718,8 @@ same as `substitute-in-file-name'." ;; other table that provides the "main" completion. Let the ;; other table handle the test-completion case. nil) - ((eq (car-safe action) 'boundaries) - ;; Only return boundaries if there's something to complete, + ((or (eq (car-safe action) 'boundaries) (eq action 'metadata)) + ;; Only return boundaries/metadata if there's something to complete, ;; since otherwise when we're used in ;; completion-table-in-turn, we could return boundaries and ;; let some subsequent table return a list of completions. @@ -1684,11 +1729,13 @@ same as `substitute-in-file-name'." (when (try-completion (substring string beg) table nil) ;; Compute the boundaries of the subfield to which this ;; completion applies. - (let ((suffix (cdr action))) - (list* 'boundaries - (or (match-beginning 2) (match-beginning 1)) - (when (string-match "[^[:alnum:]_]" suffix) - (match-beginning 0)))))) + (if (eq action 'metadata) + '(metadata (category . environment-variable)) + (let ((suffix (cdr action))) + (list* 'boundaries + (or (match-beginning 2) (match-beginning 1)) + (when (string-match "[^[:alnum:]_]" suffix) + (match-beginning 0))))))) (t (if (eq (aref string (1- beg)) ?{) (setq table (apply-partially 'completion-table-with-terminator @@ -1927,7 +1974,11 @@ and `read-file-name-function'." ;; minibuffer-completing-file-name is a variable used internally in minibuf.c ;; to determine whether to use minibuffer-local-filename-completion-map or ;; minibuffer-local-completion-map. It shouldn't be exported to Elisp. -(make-obsolete-variable 'minibuffer-completing-file-name nil "24.1") +;; FIXME: Actually, it is also used in rfn-eshadow.el we'd otherwise have to +;; use (eq minibuffer-completion-table #'read-file-name-internal), which is +;; probably even worse. Maybe We should add some read-file-name-setup-hook +;; instead, but for now, let's keep this non-obsolete. +;;(make-obsolete-variable 'minibuffer-completing-file-name nil "24.1" 'get) (defun read-file-name-default (prompt &optional dir default-filename mustmatch initial predicate) "Default method for reading file names. @@ -2299,7 +2350,8 @@ PATTERN is as returned by `completion-pcm--string->pattern'." (case-fold-search completion-ignore-case) (completion-regexp-list (cons regex completion-regexp-list)) (compl (all-completions - (concat prefix (if (stringp (car pattern)) (car pattern) "")) + (concat prefix + (if (stringp (car pattern)) (car pattern) "")) table pred))) (if (not (functionp table)) ;; The internal functions already obeyed completion-regexp-list. @@ -2397,13 +2449,14 @@ filter out additional entries (because TABLE migth not obey PRED)." (- (length newbeforepoint) (car newbounds))))) (dolist (submatch suball) - (setq all (nconc (mapcar - (lambda (s) (concat submatch between s)) - (funcall filter - (completion-pcm--all-completions - (concat subprefix submatch between) - pattern table pred))) - all))) + (setq all (nconc + (mapcar + (lambda (s) (concat submatch between s)) + (funcall filter + (completion-pcm--all-completions + (concat subprefix submatch between) + pattern table pred))) + all))) ;; FIXME: This can come in handy for try-completion, ;; but isn't right for all-completions, since it lists ;; invalid completions. diff --git a/lisp/mouse.el b/lisp/mouse.el index 124f84d7d73..f35069763bd 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -278,7 +278,7 @@ The contents are the items that would be in the menu bar whether or not it is actually displayed." (interactive "@e \nP") (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) - (popup-menu (mouse-menu-bar-map) event prefix)) + (popup-menu (mouse-menu-bar-map) (unless (integerp event) event) prefix)) (make-obsolete 'mouse-popup-menubar 'mouse-menu-bar-map "23.1") (defun mouse-popup-menubar-stuff (event prefix) @@ -790,18 +790,9 @@ remains active. Otherwise, it remains until the next input event. If the click is in the echo area, display the `*Messages*' buffer." (interactive "e") - (let ((w (posn-window (event-start start-event)))) - (if (and (window-minibuffer-p w) - (not (minibuffer-window-active-p w))) - (save-excursion - ;; Swallow the up-event. - (read-event) - (set-buffer (get-buffer-create "*Messages*")) - (goto-char (point-max)) - (display-buffer (current-buffer))) - ;; Give temporary modes such as isearch a chance to turn off. - (run-hooks 'mouse-leave-buffer-hook) - (mouse-drag-track start-event t)))) + ;; Give temporary modes such as isearch a chance to turn off. + (run-hooks 'mouse-leave-buffer-hook) + (mouse-drag-track start-event t)) (defun mouse-posn-property (pos property) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index b1ee4c45373..bd9d6846a4b 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -314,11 +314,11 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT." :type 'boolean :group 'rcirc) -(defcustom rcirc-decode-coding-system nil +(defcustom rcirc-decode-coding-system 'utf-8 "Coding system used to decode incoming irc messages. -If nil automatically detect the coding system." +Set to 'undecided if you want the encoding of the incoming +messages autodetected." :type 'coding-system - :version "24.1" :group 'rcirc) (defcustom rcirc-encode-coding-system 'utf-8 @@ -1482,8 +1482,7 @@ record activity." (old-point (point-marker)) (fill-start (marker-position rcirc-prompt-start-marker))) - (setq text (decode-coding-string text (or rcirc-decode-coding-system - (detect-coding-string text t)))) + (setq text (decode-coding-string text rcirc-decode-coding-system)) (unless (string= sender (rcirc-nick process)) ;; mark the line with overlay arrow (unless (or (marker-position overlay-arrow-position) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index b3278dc312d..269b47be20c 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -541,7 +541,7 @@ is no information where to trace the message.") "Like `copy-file' for Tramp files." (with-parsed-tramp-file-name (if (tramp-tramp-file-p filename) filename newname) nil - (with-progress-reporter + (tramp-with-progress-reporter v 0 (format "Copying %s to %s" filename newname) (condition-case err (let ((args @@ -745,7 +745,7 @@ is no information where to trace the message.") "Like `rename-file' for Tramp files." (with-parsed-tramp-file-name (if (tramp-tramp-file-p filename) filename newname) nil - (with-progress-reporter + (tramp-with-progress-reporter v 0 (format "Renaming %s to %s" filename newname) (condition-case err (rename-file @@ -1203,7 +1203,7 @@ connection if a previous connection has died for some reason." (tramp-gvfs-object-path (tramp-make-tramp-file-name method user host "")))) - (with-progress-reporter + (tramp-with-progress-reporter vec 3 (if (zerop (length user)) (format "Opening connection for %s using %s" host method) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index cc404baef06..a25877abe90 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1945,7 +1945,7 @@ file names." (tramp-error v 'file-already-exists "File %s already exists" newname)) - (with-progress-reporter + (tramp-with-progress-reporter v 0 (format "%s %s to %s" (if (eq op 'copy) "Copying" "Renaming") filename newname) @@ -2454,7 +2454,8 @@ This is like `dired-recursive-delete-directory' for Tramp files." nil) ((and suffix (nth 2 suffix)) ;; We found an uncompression rule. - (with-progress-reporter v 0 (format "Uncompressing %s" file) + (tramp-with-progress-reporter + v 0 (format "Uncompressing %s" file) (when (tramp-send-command-and-check v (concat (nth 2 suffix) " " (tramp-shell-quote-argument localname))) @@ -2465,7 +2466,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." (t ;; We don't recognize the file as compressed, so compress it. ;; Try gzip. - (with-progress-reporter v 0 (format "Compressing %s" file) + (tramp-with-progress-reporter v 0 (format "Compressing %s" file) (when (tramp-send-command-and-check v (concat "gzip -f " (tramp-shell-quote-argument localname))) @@ -2948,7 +2949,7 @@ the result will be a local, non-Tramp, filename." ;; Use inline encoding for file transfer. (rem-enc (save-excursion - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Encoding remote file %s" filename) (tramp-barf-unless-okay v (format rem-enc (tramp-shell-quote-argument localname)) @@ -2962,7 +2963,7 @@ the result will be a local, non-Tramp, filename." (with-temp-buffer (set-buffer-multibyte nil) (insert-buffer-substring (tramp-get-buffer v)) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Decoding remote file %s with function %s" filename loc-dec) (funcall loc-dec (point-min) (point-max)) @@ -2980,7 +2981,7 @@ the result will be a local, non-Tramp, filename." (let (file-name-handler-alist (coding-system-for-write 'binary)) (write-region (point-min) (point-max) tmpfile2)) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Decoding remote file %s with command %s" filename loc-dec) (unwind-protect @@ -3205,7 +3206,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." (set-buffer-multibyte nil) ;; Use encoding function or command. (if (functionp loc-enc) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Encoding region using function `%s'" loc-enc) (let ((coding-system-for-read 'binary)) @@ -3223,7 +3224,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." (tramp-compat-temporary-file-directory))) (funcall loc-enc (point-min) (point-max)))) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Encoding region using command `%s'" loc-enc) (unless (zerop (tramp-call-local-coding-command @@ -3237,7 +3238,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." ;; Send buffer into remote decoding command which ;; writes to remote file. Because this happens on ;; the remote host, we cannot use the function. - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Decoding region into remote file %s" filename) (goto-char (point-max)) @@ -3337,7 +3338,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file." "Like `vc-registered' for Tramp files." (tramp-compat-with-temp-message "" (with-parsed-tramp-file-name file nil - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Checking `vc-registered' for %s" file) ;; There could be new files, created by the vc backend. We @@ -3431,7 +3432,7 @@ Only send the definition if it has not already been done." (let* ((p (tramp-get-connection-process vec)) (scripts (tramp-get-connection-property p "scripts" nil))) (unless (member name scripts) - (with-progress-reporter vec 5 (format "Sending script `%s'" name) + (tramp-with-progress-reporter vec 5 (format "Sending script `%s'" name) ;; The script could contain a call of Perl. This is masked with `%s'. (tramp-barf-unless-okay vec @@ -3595,7 +3596,8 @@ file exists and nonzero exit status otherwise." (defun tramp-open-shell (vec shell) "Opens shell SHELL." - (with-progress-reporter vec 5 (format "Opening remote shell `%s'" shell) + (tramp-with-progress-reporter + vec 5 (format "Opening remote shell `%s'" shell) ;; Find arguments for this shell. (let ((tramp-end-of-output tramp-initial-end-of-output) (alist tramp-sh-extra-args) @@ -4247,7 +4249,7 @@ connection if a previous connection has died for some reason." ;; We call `tramp-get-buffer' in order to get a debug buffer for ;; messages from the beginning. (tramp-get-buffer vec) - (with-progress-reporter + (tramp-with-progress-reporter vec 3 (if (zerop (length (tramp-file-name-user vec))) (format "Opening connection for %s using %s" diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 5a62b71bda1..a43e99c1206 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -342,7 +342,7 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server. PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored." (setq filename (expand-file-name filename) newname (expand-file-name newname)) - (with-progress-reporter + (tramp-with-progress-reporter (tramp-dissect-file-name (if (file-remote-p filename) filename newname)) 0 (format "Copying %s to %s" filename newname) @@ -600,7 +600,7 @@ PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored." v 'file-error "Cannot make local copy of non-existing file `%s'" filename)) (let ((tmpfile (tramp-compat-make-temp-file filename))) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Fetching %s to tmp file %s" filename tmpfile) (unless (tramp-smb-send-command v (format "get \"%s\" \"%s\"" @@ -837,7 +837,7 @@ target of the symlink differ." "Like `rename-file' for Tramp files." (setq filename (expand-file-name filename) newname (expand-file-name newname)) - (with-progress-reporter + (tramp-with-progress-reporter (tramp-dissect-file-name (if (file-remote-p filename) filename newname)) 0 (format "Renaming %s to %s" filename newname) @@ -926,7 +926,7 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." (list start end tmpfile append 'no-message lockname confirm) (list start end tmpfile append 'no-message lockname))) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Moving tmp file %s to %s" tmpfile filename) (unwind-protect (unless (tramp-smb-send-command @@ -1289,7 +1289,7 @@ connection if a previous connection has died for some reason." (setq args (append args (list "-s" tramp-smb-conf)))) ;; OK, let's go. - (with-progress-reporter + (tramp-with-progress-reporter vec 3 (format "Opening connection for //%s%s/%s" (if (not (zerop (length user))) (concat user "@") "") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 537ccf6da6a..178f057a66c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1452,11 +1452,12 @@ If VAR is nil, then we bind `v' to the structure and `method', `user', (when (string-match message (or (current-message) "")) (tramp-compat-funcall 'progress-reporter-update reporter value)))) -(defmacro with-progress-reporter (vec level message &rest body) +(defmacro tramp-with-progress-reporter (vec level message &rest body) "Executes BODY, spinning a progress reporter with MESSAGE. If LEVEL does not fit for visible messages, or if this is a nested call of the macro, there are only traces without a visible progress reporter." + (declare (indent 3) (debug t)) `(let (pr tm) (tramp-message ,vec ,level "%s..." ,message) ;; We start a pulsing progress reporter after 3 seconds. Feature @@ -1479,10 +1480,8 @@ progress reporter." (if tm (tramp-compat-funcall 'cancel-timer tm)) (tramp-message ,vec ,level "%s...done" ,message)))) -(put 'with-progress-reporter 'lisp-indent-function 3) -(put 'with-progress-reporter 'edebug-form-spec t) (tramp-compat-font-lock-add-keywords - 'emacs-lisp-mode '("\\<with-progress-reporter\\>")) + 'emacs-lisp-mode '("\\<tramp-with-progress-reporter\\>")) (eval-and-compile ;; Silence compiler. (if (memq system-type '(cygwin windows-nt)) @@ -2881,7 +2880,7 @@ User is always nil." ;; useful for "rsync". (setq tramp-temp-buffer-file-name local-copy)) - (with-progress-reporter + (tramp-with-progress-reporter v 3 (format "Inserting local temp file `%s'" local-copy) ;; We must ensure that `file-coding-system-alist' ;; matches `local-copy'. @@ -2932,7 +2931,7 @@ User is always nil." (if (not (file-exists-p file)) nil (let ((tramp-message-show-message (not nomessage))) - (with-progress-reporter v 0 (format "Loading %s" file) + (tramp-with-progress-reporter v 0 (format "Loading %s" file) (let ((local-copy (file-local-copy file))) ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil. (unwind-protect diff --git a/lisp/proced.el b/lisp/proced.el index ddc4ed1db14..4436129ce16 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -1735,8 +1735,9 @@ After sending the signal, this command runs the normal hook (pnum (if (= 1 (length process-alist)) "1 process" (format "%d processes" (length process-alist)))) - (completion-annotate-function - (lambda (s) (cdr (assoc s proced-signal-list))))) + (completion-extra-properties + '(:annotation-function + (lambda (s) (cdr (assoc s proced-signal-list)))))) (setq signal (completing-read (concat "Send signal [" pnum "] (default TERM): ") diff --git a/lisp/server.el b/lisp/server.el index c421ee09812..04d35695c57 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -235,9 +235,10 @@ If local sockets are not supported, this is nil.") (defun server-clients-with (property value) "Return a list of clients with PROPERTY set to VALUE." (let (result) - (dolist (proc server-clients result) + (dolist (proc server-clients) (when (equal value (process-get proc property)) - (push proc result))))) + (push proc result))) + result)) (defun server-add-client (proc) "Create a client for process PROC, if it doesn't already have one. @@ -1322,10 +1323,11 @@ specifically for the clients and did not exist before their request for it." "Ask before killing a server buffer." (or (not server-buffer-clients) (let ((res t)) - (dolist (proc server-buffer-clients res) + (dolist (proc server-buffer-clients) (when (and (memq proc server-clients) (eq (process-status proc) 'open)) - (setq res nil)))) + (setq res nil))) + res) (yes-or-no-p (format "Buffer `%s' still has clients; kill it? " (buffer-name (current-buffer)))))) @@ -1333,10 +1335,11 @@ specifically for the clients and did not exist before their request for it." "Ask before exiting Emacs if it has live clients." (or (not server-clients) (let (live-client) - (dolist (proc server-clients live-client) + (dolist (proc server-clients) (when (memq t (mapcar 'buffer-live-p (process-get proc 'buffers))) - (setq live-client t)))) + (setq live-client t))) + live-client) (yes-or-no-p "This Emacs session has clients; exit anyway? "))) (defun server-kill-buffer () diff --git a/lisp/simple.el b/lisp/simple.el index 18ae1367d74..76269c9ef9a 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -967,13 +967,11 @@ rather than line counts." (concat " in " (buffer-name buffer)) ""))) ;; Read the argument, offering that number (if any) as default. - (list (read-from-minibuffer (format (if default "Goto line%s (%s): " - "Goto line%s: ") - buffer-prompt - default) - nil nil t - 'minibuffer-history - default) + (list (read-number (format (if default "Goto line%s (%s): " + "Goto line%s: ") + buffer-prompt + default) + default) buffer)))) ;; Switch to the desired buffer, one way or another. (if buffer @@ -1158,7 +1156,7 @@ in *Help* buffer. See also the command `describe-char'." (defvar minibuffer-completing-symbol nil "Non-nil means completing a Lisp symbol in the minibuffer.") -(make-obsolete-variable 'minibuffer-completing-symbol nil "24.1") +(make-obsolete-variable 'minibuffer-completing-symbol nil "24.1" 'get) (defvar minibuffer-default nil "The current default value or list of default values in the minibuffer. @@ -2815,25 +2813,21 @@ The return value is always nil." `universal-argument-other-key' uses this to discard those events from (this-command-keys), and reread only the final command.") -(defvar overriding-map-is-bound nil - "Non-nil when `overriding-terminal-local-map' is `universal-argument-map'.") - -(defvar saved-overriding-map nil +(defvar saved-overriding-map t "The saved value of `overriding-terminal-local-map'. That variable gets restored to this value on exiting \"universal argument mode\".") -(defun ensure-overriding-map-is-bound () - "Check `overriding-terminal-local-map' is `universal-argument-map'." - (unless overriding-map-is-bound +(defun save&set-overriding-map (map) + "Set `overriding-terminal-local-map' to MAP." + (when (eq saved-overriding-map t) (setq saved-overriding-map overriding-terminal-local-map) - (setq overriding-terminal-local-map universal-argument-map) - (setq overriding-map-is-bound t))) + (setq overriding-terminal-local-map map))) (defun restore-overriding-map () "Restore `overriding-terminal-local-map' to its saved value." (setq overriding-terminal-local-map saved-overriding-map) - (setq overriding-map-is-bound nil)) + (setq saved-overriding-map t)) (defun universal-argument () "Begin a numeric argument for the following command. @@ -2848,7 +2842,7 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." (interactive) (setq prefix-arg (list 4)) (setq universal-argument-num-events (length (this-command-keys))) - (ensure-overriding-map-is-bound)) + (save&set-overriding-map universal-argument-map)) ;; A subsequent C-u means to multiply the factor by 4 if we've typed ;; nothing but C-u's; otherwise it means to terminate the prefix arg. @@ -2873,7 +2867,7 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." (t (setq prefix-arg '-))) (setq universal-argument-num-events (length (this-command-keys))) - (ensure-overriding-map-is-bound)) + (save&set-overriding-map universal-argument-map)) (defun digit-argument (arg) "Part of the numeric argument for the next command. @@ -2892,7 +2886,7 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." (t (setq prefix-arg digit)))) (setq universal-argument-num-events (length (this-command-keys))) - (ensure-overriding-map-is-bound)) + (save&set-overriding-map universal-argument-map)) ;; For backward compatibility, minus with no modifiers is an ordinary ;; command if digits have already been entered. @@ -5177,8 +5171,8 @@ Returns t if it really did any work." (or (null fill-prefix) (string= fill-prefix ""))) (let ((prefix (fill-context-prefix - (save-excursion (backward-paragraph 1) (point)) - (save-excursion (forward-paragraph 1) (point))))) + (save-excursion (fill-forward-paragraph -1) (point)) + (save-excursion (fill-forward-paragraph 1) (point))))) (and prefix (not (equal prefix "")) ;; Use auto-indentation rather than a guessed empty prefix. (not (and fill-indent-according-to-mode @@ -5660,7 +5654,8 @@ At top-level, as an editor command, this simply beeps." (if (fboundp 'kmacro-keyboard-quit) (kmacro-keyboard-quit)) (setq defining-kbd-macro nil) - (signal 'quit nil)) + (let ((debug-on-quit nil)) + (signal 'quit nil))) (defvar buffer-quit-function nil "Function to call to \"quit\" the current buffer, or nil if none. diff --git a/lisp/subr.el b/lisp/subr.el index 4fe9987b95b..74c9ce57d8f 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1805,6 +1805,13 @@ Signal an error if the program returns with a non-zero exit status." (forward-line 1)) (nreverse lines))))) +(defun process-alive-p (process) + "Returns non-nil if PROCESS is alive. +A process is considered alive if its status is `run', `open', +`listen', `connect' or `stop'." + (memq (process-status process) + '(run open listen connect stop))) + ;; compatibility (make-obsolete @@ -2919,6 +2926,7 @@ with the buffer BUFNAME temporarily current. It runs the hook buffer temporarily current, and the window that was used to display it temporarily selected. But it doesn't run `temp-buffer-show-hook' if it uses `temp-buffer-show-function'." + (declare (debug t)) (let ((old-dir (make-symbol "old-dir")) (buf (make-symbol "buf"))) `(let* ((,old-dir default-directory) diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index a2aeb2e6d67..8f797d13103 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -402,7 +402,7 @@ with angle brackets.") (re-search-forward "[ \t]+\\|\n" nil 'move arg) (while (< arg 0) (if (re-search-backward "[ \t]+\\|\n" nil 'move) - (or (eq (char-after (match-beginning 0)) 10) + (or (eq (char-after (match-beginning 0)) ?\n) (skip-chars-backward " \t"))) (setq arg (1+ arg))))) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 37a9fb8ffe2..e5ab59e828f 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,17 @@ +2011-06-01 Glenn Morris <rgm@gnu.org> + + * url-queue.el (url-queue-parallel-processes, url-queue-timeout): + Add :version tag for options that will be new in 24.1. + +2011-05-31 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * url-queue.el (url-queue-parallel-processes): Increase the + default to 6, since 2 seems too conservative for normal usage. + +2011-05-31 Teodor Zlatanov <tzz@lifelogs.com> + + * url-future.el: Add general futures facility. + 2011-05-29 Leo Liu <sdl.web@gmail.com> * url-cookie.el (url-cookie): Add option :named so that diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el new file mode 100644 index 00000000000..334c4fa9126 --- /dev/null +++ b/lisp/url/url-future.el @@ -0,0 +1,126 @@ +;;; url-future.el --- general futures facility for url.el + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; Author: Teodor Zlatanov <tzz@lifelogs.com> +;; Keywords: data + +;; 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 <http://www.gnu.org/licenses/>. + +;;; Commentary: + +;; Make a url-future (basically a defstruct): +;; (make-url-future :value (lambda () (calculation goes here)) +;; :callback (lambda (future) (use future on success)) +;; :errorback (lambda (future &rest error) (error handler))) + +;; Then either call it with `url-future-call' or cancel it with +;; `url-future-cancel'. Generally the functions will return the +;; future itself, not the value it holds. Also the functions will +;; throw a url-future-already-done error if you try to call or cancel +;; a future more than once. + +;; So, to get the value: +;; (when (url-future-completed-p future) (url-future-value future)) + +;; See the ERT tests and the code for futher details. + +;;; Code: + +(eval-when-compile (require 'cl)) +(eval-when-compile (require 'ert)) + +(defstruct url-future callback errorback status value) + +(defmacro url-future-done-p (url-future) + `(url-future-status ,url-future)) + +(defmacro url-future-completed-p (url-future) + `(eq (url-future-status ,url-future) t)) + +(defmacro url-future-errored-p (url-future) + `(eq (url-future-status ,url-future) 'error)) + +(defmacro url-future-cancelled-p (url-future) + `(eq (url-future-status ,url-future) 'cancel)) + +(defun url-future-finish (url-future &optional status) + (if (url-future-done-p url-future) + (signal 'error 'url-future-already-done) + (setf (url-future-status url-future) (or status t)) + ;; the status must be such that the future was completed + ;; to run the callback + (when (url-future-completed-p url-future) + (funcall (or (url-future-callback url-future) 'ignore) + url-future)) + url-future)) + +(defun url-future-errored (url-future errorcons) + (if (url-future-done-p url-future) + (signal 'error 'url-future-already-done) + (setf (url-future-status url-future) 'error) + (setf (url-future-value url-future) errorcons) + (funcall (or (url-future-errorback url-future) 'ignore) + url-future errorcons))) + +(defun url-future-call (url-future) + (if (url-future-done-p url-future) + (signal 'error 'url-future-already-done) + (let ((ff (url-future-value url-future))) + (when (functionp ff) + (condition-case catcher + (setf (url-future-value url-future) + (funcall ff)) + (error (url-future-errored url-future catcher))) + (url-future-value url-future))) + (if (url-future-errored-p url-future) + url-future + (url-future-finish url-future)))) + +(defun url-future-cancel (url-future) + (if (url-future-done-p url-future) + (signal 'error 'url-future-already-done) + (url-future-finish url-future 'cancel))) + +(ert-deftest url-future-test () + (let* ((text "running future") + (good (make-url-future :value (lambda () (format text)) + :callback (lambda (f) (set 'saver f)))) + (bad (make-url-future :value (lambda () (/ 1 0)) + :errorback (lambda (&rest d) (set 'saver d)))) + (tocancel (make-url-future :value (lambda () (/ 1 0)) + :callback (lambda (f) (set 'saver f)) + :errorback (lambda (&rest d) + (set 'saver d)))) + saver) + (should (equal good (url-future-call good))) + (should (equal good saver)) + (should (equal text (url-future-value good))) + (should (url-future-completed-p good)) + (should-error (url-future-call good)) + (setq saver nil) + (should (equal bad (url-future-call bad))) + (should-error (url-future-call bad)) + (should (equal saver (list bad '(arith-error)))) + (should (url-future-errored-p bad)) + (setq saver nil) + (should (equal (url-future-cancel tocancel) tocancel)) + (should-error (url-future-call tocancel)) + (should (null saver)) + (should (url-future-cancelled-p tocancel)))) + +(provide 'url-future) +;;; url-future.el ends here diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el index 08496ad5afb..c5150a93561 100644 --- a/lisp/url/url-queue.el +++ b/lisp/url/url-queue.el @@ -31,13 +31,15 @@ (eval-when-compile (require 'cl)) (require 'browse-url) -(defcustom url-queue-parallel-processes 2 +(defcustom url-queue-parallel-processes 6 "The number of concurrent processes." + :version "24.1" :type 'integer :group 'url) (defcustom url-queue-timeout 5 "How long to let a job live once it's started (in seconds)." + :version "24.1" :type 'integer :group 'url) |