Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 104076. ------------------------------------------------------------ revno: 104076 fixes bug(s): http://debbugs.gnu.org/8596 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-05-02 05:57:02 +0200 message: src/sysdep.c (get_tty_size) [WINDOWSNT]: Implement. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-02 02:49:06 +0000 +++ src/ChangeLog 2011-05-02 03:57:02 +0000 @@ -1,5 +1,9 @@ 2011-05-02 Juanma Barranquero + * sysdep.c (get_tty_size) [WINDOWSNT]: Implement. (Bug#8596) + +2011-05-02 Juanma Barranquero + * gnutls.c (Qgnutls_log_level, Qgnutls_code, Qgnutls_anon) (Qgnutls_x509pki, Qgnutls_e_interrupted, Qgnutls_e_again) (Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake) === modified file 'src/sysdep.c' --- src/sysdep.c 2011-05-01 08:52:17 +0000 +++ src/sysdep.c 2011-05-02 03:57:02 +0000 @@ -1125,8 +1125,7 @@ void get_tty_size (int fd, int *widthp, int *heightp) { - -#ifdef TIOCGWINSZ +#if defined TIOCGWINSZ /* BSD-style. */ struct winsize size; @@ -1139,8 +1138,7 @@ *heightp = size.ws_row; } -#else -#ifdef TIOCGSIZE +#elif defined TIOCGSIZE /* SunOS - style. */ struct ttysize size; @@ -1153,16 +1151,28 @@ *heightp = size.ts_lines; } -#else -#ifdef MSDOS +#elif defined WINDOWSNT + + CONSOLE_SCREEN_BUFFER_INFO info; + if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info)) + { + *widthp = info.srWindow.Right - info.srWindow.Left + 1; + *heightp = info.srWindow.Bottom - info.srWindow.Top + 1; + } + else + *widthp = *heightp = 0; + +#elif defined MSDOS + *widthp = ScreenCols (); *heightp = ScreenRows (); + #else /* system doesn't know size */ + *widthp = 0; *heightp = 0; + #endif -#endif /* not SunOS-style */ -#endif /* not BSD-style */ } /* Set the logical window size associated with descriptor FD ------------------------------------------------------------ revno: 104075 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-05-02 03:37:06 +0000 message: nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved from that file for reuse. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-02 01:19:21 +0000 +++ lisp/gnus/ChangeLog 2011-05-02 03:37:06 +0000 @@ -1,5 +1,8 @@ 2011-05-02 Lars Magne Ingebrigtsen + * nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- + and moved from that file for reuse. + * pop3.el (pop3-open-server): Error messages are "-ERR". 2011-05-01 Lars Magne Ingebrigtsen === modified file 'lisp/gnus/nnheader.el' --- lisp/gnus/nnheader.el 2011-02-03 07:25:14 +0000 +++ lisp/gnus/nnheader.el 2011-05-02 03:37:06 +0000 @@ -1099,6 +1099,19 @@ backend-marks))))) backend-marks) +(defmacro nnheader-insert-buffer-substring (buffer &optional start end) + "Copy string from unibyte buffer to multibyte current buffer." + (if (featurep 'xemacs) + `(insert-buffer-substring ,buffer ,start ,end) + `(if enable-multibyte-characters + (insert (with-current-buffer ,buffer + (mm-string-to-multibyte + ,(if (or start end) + `(buffer-substring (or ,start (point-min)) + (or ,end (point-max))) + '(buffer-string))))) + (insert-buffer-substring ,buffer ,start ,end)))) + (when (featurep 'xemacs) (require 'nnheaderxm)) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-05-01 23:30:18 +0000 +++ lisp/gnus/nnimap.el 2011-05-02 03:37:06 +0000 @@ -545,7 +545,7 @@ (nnimap-get-whole-article article)) (let ((buffer (current-buffer))) (with-current-buffer (or to-buffer nntp-server-buffer) - (nntp-insert-buffer-substring buffer) + (nnheader-insert-buffer-substring buffer) (nnheader-ms-strip-cr))) (cons group article))))))) === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2011-05-01 23:30:18 +0000 +++ lisp/gnus/nntp.el 2011-05-02 03:37:06 +0000 @@ -364,19 +364,6 @@ (throw 'nntp-with-open-group-error t)) -(defmacro nntp-insert-buffer-substring (buffer &optional start end) - "Copy string from unibyte buffer to multibyte current buffer." - (if (featurep 'xemacs) - `(insert-buffer-substring ,buffer ,start ,end) - `(if enable-multibyte-characters - (insert (with-current-buffer ,buffer - (mm-string-to-multibyte - ,(if (or start end) - `(buffer-substring (or ,start (point-min)) - (or ,end (point-max))) - '(buffer-string))))) - (insert-buffer-substring ,buffer ,start ,end)))) - (defmacro nntp-copy-to-buffer (buffer start end) "Copy string from unibyte current buffer to multibyte buffer." (if (featurep 'xemacs) @@ -434,7 +421,7 @@ (unless discard (with-current-buffer buffer (goto-char (point-max)) - (nntp-insert-buffer-substring (process-buffer process)) + (nnheader-insert-buffer-substring (process-buffer process)) ;; Nix out "nntp reading...." message. (when nntp-have-messaged (setq nntp-have-messaged nil) @@ -996,7 +983,7 @@ (narrow-to-region (setq point (goto-char (point-max))) (progn - (nntp-insert-buffer-substring buf last-point (cdr entry)) + (nnheader-insert-buffer-substring buf last-point (cdr entry)) (point-max))) (setq last-point (cdr entry)) (nntp-decode-text) @@ -1472,7 +1459,7 @@ (goto-char (point-max)) (save-restriction (narrow-to-region (point) (point)) - (nntp-insert-buffer-substring buf start) + (nnheader-insert-buffer-substring buf start) (when decode (nntp-decode-text)))))) ;; report it. @@ -1700,7 +1687,7 @@ (when in-process-buffer-p (set-buffer buf) (goto-char (point-max)) - (nntp-insert-buffer-substring process-buffer) + (nnheader-insert-buffer-substring process-buffer) (set-buffer process-buffer) (erase-buffer) (set-buffer buf)) ------------------------------------------------------------ revno: 104074 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-05-02 04:49:06 +0200 message: src/gnutls.c: Make static a bunch of variables. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-01 09:02:01 +0000 +++ src/ChangeLog 2011-05-02 02:49:06 +0000 @@ -1,3 +1,15 @@ +2011-05-02 Juanma Barranquero + + * gnutls.c (Qgnutls_log_level, Qgnutls_code, Qgnutls_anon) + (Qgnutls_x509pki, Qgnutls_e_interrupted, Qgnutls_e_again) + (Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake) + (gnutls_global_initialized, Qgnutls_bootprop_priority) + (Qgnutls_bootprop_trustfiles, Qgnutls_bootprop_keyfiles) + (Qgnutls_bootprop_callbacks, Qgnutls_bootprop_loglevel) + (Qgnutls_bootprop_hostname, Qgnutls_bootprop_verify_flags) + (Qgnutls_bootprop_verify_error, Qgnutls_bootprop_verify_hostname_error) + (Qgnutls_bootprop_callbacks_verify): Make static. + 2011-05-01 Andreas Schwab * callproc.c: Indentation fixup. === modified file 'src/gnutls.c' --- src/gnutls.c 2011-04-26 17:50:51 +0000 +++ src/gnutls.c 2011-05-02 02:49:06 +0000 @@ -34,26 +34,26 @@ static int emacs_gnutls_handle_error (gnutls_session_t, int err); -Lisp_Object Qgnutls_log_level; -Lisp_Object Qgnutls_code; -Lisp_Object Qgnutls_anon, Qgnutls_x509pki; -Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again, +static Lisp_Object Qgnutls_log_level; +static Lisp_Object Qgnutls_code; +static Lisp_Object Qgnutls_anon, Qgnutls_x509pki; +static Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again, Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake; -int gnutls_global_initialized; +static int gnutls_global_initialized; /* The following are for the property list of `gnutls-boot'. */ -Lisp_Object Qgnutls_bootprop_priority; -Lisp_Object Qgnutls_bootprop_trustfiles; -Lisp_Object Qgnutls_bootprop_keyfiles; -Lisp_Object Qgnutls_bootprop_callbacks; -Lisp_Object Qgnutls_bootprop_loglevel; -Lisp_Object Qgnutls_bootprop_hostname; -Lisp_Object Qgnutls_bootprop_verify_flags; -Lisp_Object Qgnutls_bootprop_verify_error; -Lisp_Object Qgnutls_bootprop_verify_hostname_error; +static Lisp_Object Qgnutls_bootprop_priority; +static Lisp_Object Qgnutls_bootprop_trustfiles; +static Lisp_Object Qgnutls_bootprop_keyfiles; +static Lisp_Object Qgnutls_bootprop_callbacks; +static Lisp_Object Qgnutls_bootprop_loglevel; +static Lisp_Object Qgnutls_bootprop_hostname; +static Lisp_Object Qgnutls_bootprop_verify_flags; +static Lisp_Object Qgnutls_bootprop_verify_error; +static Lisp_Object Qgnutls_bootprop_verify_hostname_error; /* Callback keys for `gnutls-boot'. Unused currently. */ -Lisp_Object Qgnutls_bootprop_callbacks_verify; +static Lisp_Object Qgnutls_bootprop_callbacks_verify; static void gnutls_log_function (int level, const char* string) @@ -490,7 +490,7 @@ /* callbacks = Fplist_get (proplist, Qgnutls_bootprop_callbacks); */ loglevel = Fplist_get (proplist, Qgnutls_bootprop_loglevel); verify_flags = Fplist_get (proplist, Qgnutls_bootprop_verify_flags); - /* verify_error = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */ + /* verify_error = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */ verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error); if (!STRINGP (hostname)) @@ -918,4 +918,5 @@ defsubr (&Sgnutls_deinit); defsubr (&Sgnutls_bye); } -#endif + +#endif /* HAVE_GNUTLS */ ------------------------------------------------------------ revno: 104073 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Mon 2011-05-02 04:33:11 +0200 message: Decode &_ => SPC in the reply. diff: === modified file 'lisp/server.el' --- lisp/server.el 2011-05-02 02:06:53 +0000 +++ lisp/server.el 2011-05-02 02:33:11 +0000 @@ -1487,8 +1487,8 @@ (defun server-eval-at (server form) "Eval FORM on Emacs Server SERVER." (let ((auth-file (expand-file-name server server-auth-dir)) - ;;(coding-system-for-read 'binary) - ;;(coding-system-for-write 'binary) + (coding-system-for-read 'binary) + (coding-system-for-write 'binary) address port secret process) (unless (file-exists-p auth-file) (error "No such server definition: %s" auth-file)) @@ -1516,8 +1516,12 @@ (goto-char (point-min)) ;; If the result is nil, there's nothing in the buffer. If the ;; result is non-nil, it's after "-print ". - (and (search-forward "\n-print" nil t) - (read (current-buffer)))))) + (when (search-forward "\n-print" nil t) + (let ((start (point))) + (while (search-forward "&_" nil t) + (replace-match " " t t)) + (goto-char start) + (read (current-buffer))))))) (provide 'server) ------------------------------------------------------------ revno: 104072 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Mon 2011-05-02 04:06:53 +0200 message: Implement and document `server-eval-at'. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-04-24 18:47:17 +0000 +++ doc/emacs/ChangeLog 2011-05-02 02:06:53 +0000 @@ -1,3 +1,7 @@ +2011-05-02 Lars Magne Ingebrigtsen + + * misc.texi (Emacs Server): Document `server-eval-at'. + 2011-04-24 Chong Yidong * maintaining.texi (List Tags): Document next-file. Suggested by === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2011-03-03 07:00:23 +0000 +++ doc/emacs/misc.texi 2011-05-02 02:06:53 +0000 @@ -1495,6 +1495,15 @@ @samp{foo}. The @code{emacsclient} program can specify a server by name, using the @samp{-s} option (@pxref{emacsclient Options}). +@findex server-eval-at + If you have defined a server by a unique server name, you can +connect to this server from other Emacs instances and evaluate forms +on it by using the @code{server-eval-at} function. + +@code{(server-eval-at "foo" '(+ 1 2))} gives the result @code{3}, if +there's a server with that name that is listening. If not, an error +will be signaled. + @menu * Invoking emacsclient:: Connecting to the Emacs server. * emacsclient Options:: Emacs client startup options. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-01 15:39:10 +0000 +++ lisp/ChangeLog 2011-05-02 02:06:53 +0000 @@ -1,3 +1,7 @@ +2011-05-02 Lars Magne Ingebrigtsen + + * server.el (server-eval-at): New function. + 2011-05-01 Lars Magne Ingebrigtsen * net/network-stream.el (open-network-stream): Take a :nowait === modified file 'lisp/server.el' --- lisp/server.el 2011-03-21 16:42:16 +0000 +++ lisp/server.el 2011-05-02 02:06:53 +0000 @@ -1484,6 +1484,41 @@ ;; continue standard unloading nil) +(defun server-eval-at (server form) + "Eval FORM on Emacs Server SERVER." + (let ((auth-file (expand-file-name server server-auth-dir)) + ;;(coding-system-for-read 'binary) + ;;(coding-system-for-write 'binary) + address port secret process) + (unless (file-exists-p auth-file) + (error "No such server definition: %s" auth-file)) + (with-temp-buffer + (insert-file-contents auth-file) + (unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)") + (error "Invalid auth file")) + (setq address (match-string 1) + port (string-to-number (match-string 2))) + (forward-line 1) + (setq secret (buffer-substring (point) (line-end-position))) + (erase-buffer) + (unless (setq process (open-network-stream "eval-at" (current-buffer) + address port)) + (error "Unable to contact the server")) + (set-process-query-on-exit-flag process nil) + (process-send-string + process + (concat "-auth " secret " -eval " + (replace-regexp-in-string + " " "&_" (format "%S" form)) + "\n")) + (while (memq (process-status process) '(open run)) + (accept-process-output process 0 10)) + (goto-char (point-min)) + ;; If the result is nil, there's nothing in the buffer. If the + ;; result is non-nil, it's after "-print ". + (and (search-forward "\n-print" nil t) + (read (current-buffer)))))) + (provide 'server) ------------------------------------------------------------ revno: 104071 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-05-02 01:45:17 +0000 message: pop3.el (pop3-open-server): Fix It's `tls', not :tls. diff: === modified file 'lisp/gnus/pop3.el' --- lisp/gnus/pop3.el 2011-05-02 01:19:21 +0000 +++ lisp/gnus/pop3.el 2011-05-02 01:45:17 +0000 @@ -302,7 +302,7 @@ ((or (eq pop3-stream-type 'ssl) (and (not pop3-stream-type) (member port '(995 "pop3s")))) - :tls) + 'tls) (t (or pop3-stream-type 'network))) :capability-command "CAPA\r\n" ------------------------------------------------------------ revno: 104070 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-05-02 01:19:21 +0000 message: pop3.el (pop3-open-server): Error messages are "-ERR". diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-01 23:30:18 +0000 +++ lisp/gnus/ChangeLog 2011-05-02 01:19:21 +0000 @@ -1,3 +1,7 @@ +2011-05-02 Lars Magne Ingebrigtsen + + * pop3.el (pop3-open-server): Error messages are "-ERR". + 2011-05-01 Lars Magne Ingebrigtsen * pop3.el (pop3-open-server): Upgrade opportunistically to STARTTLS. === modified file 'lisp/gnus/pop3.el' --- lisp/gnus/pop3.el 2011-05-01 23:30:18 +0000 +++ lisp/gnus/pop3.el 2011-05-02 01:19:21 +0000 @@ -306,7 +306,7 @@ (t (or pop3-stream-type 'network))) :capability-command "CAPA\r\n" - :end-of-command "^\\.\r?\n\\|^\\+[A-Z]+ .*\n" + :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n" :success "^\\+OK.*\n" :return-list t :starttls-function ------------------------------------------------------------ revno: 104069 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2011-05-01 23:30:18 +0000 message: Merge changes made in Gnus trunk. pop3.el (pop3-open-server): Upgrade opportunistically to STARTTLS. (open-tls-stream): Remove superfluous tls/starttls autoloads. gnus-sum.el (gnus-summary-next-article): Don't bug out if the summary buffer has moved to a different frame. nnimap.el (nnimap-request-article): Use nntp-insert-buffer-substring to get the conversion from unibyte to multibyte buffers to work on Emacs 22. nntp.el (nntp-request-article): Slight clean-up. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-04-30 00:03:19 +0000 +++ lisp/gnus/ChangeLog 2011-05-01 23:30:18 +0000 @@ -1,3 +1,21 @@ +2011-05-01 Lars Magne Ingebrigtsen + + * pop3.el (pop3-open-server): Upgrade opportunistically to STARTTLS. + (open-tls-stream): Remove superfluous tls/starttls autoloads. + +2011-05-01 Stefan Monnier + + * gnus-sum.el (gnus-summary-next-article): Don't bug out if the summary + buffer has moved to a different frame. + +2011-05-01 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-request-article): Use nntp-insert-buffer-substring + to get the conversion from unibyte to multibyte buffers to work on + Emacs 22. + + * nntp.el (nntp-request-article): Slight clean-up. + 2011-04-29 Lars Magne Ingebrigtsen * shr.el (shr-strike-through): New face. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-04-23 02:18:10 +0000 +++ lisp/gnus/gnus-sum.el 2011-05-01 23:30:18 +0000 @@ -7783,7 +7783,8 @@ ;; Somehow or other, we may now have selected a different ;; window. Make point go back to the summary buffer. (when (eq current-summary (current-buffer)) - (select-window (get-buffer-window current-summary))) + ;; FIXME: This burps when get-buffer-window returns nil. + (select-window (get-buffer-window current-summary 0))) (gnus-summary-walk-group-buffer gnus-newsgroup-name cmd unread backward point)))))))) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-04-22 01:01:32 +0000 +++ lisp/gnus/nnimap.el 2011-05-01 23:30:18 +0000 @@ -545,10 +545,9 @@ (nnimap-get-whole-article article)) (let ((buffer (current-buffer))) (with-current-buffer (or to-buffer nntp-server-buffer) - (erase-buffer) - (insert-buffer-substring buffer) - (nnheader-ms-strip-cr) - (cons group article))))))))) + (nntp-insert-buffer-substring buffer) + (nnheader-ms-strip-cr))) + (cons group article))))))) (deffoo nnimap-request-head (article &optional group server to-buffer) (when (nnimap-possibly-change-group group server) === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2011-04-02 23:41:03 +0000 +++ lisp/gnus/nntp.el 2011-05-01 23:30:18 +0000 @@ -1028,16 +1028,15 @@ (deffoo nntp-request-article (article &optional group server buffer command) (nntp-with-open-group - group server + group server (when (nntp-send-command-and-decode "\r?\n\\.\r?\n" "ARTICLE" (if (numberp article) (int-to-string article) article)) - (if (and buffer - (not (equal buffer nntp-server-buffer))) - (with-current-buffer nntp-server-buffer - (copy-to-buffer buffer (point-min) (point-max)) - (nntp-find-group-and-number group)) - (nntp-find-group-and-number group))))) + (when (and buffer + (not (equal buffer nntp-server-buffer))) + (with-current-buffer nntp-server-buffer + (copy-to-buffer buffer (point-min) (point-max)))) + (nntp-find-group-and-number group)))) (deffoo nntp-request-head (article &optional group server) (nntp-with-open-group === modified file 'lisp/gnus/pop3.el' --- lisp/gnus/pop3.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/pop3.el 2011-05-01 23:30:18 +0000 @@ -33,6 +33,13 @@ ;;; Code: (eval-when-compile (require 'cl)) + +(eval-and-compile + ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for + ;; `make-network-stream'. + (unless (fboundp 'open-protocol-stream) + (require 'proto-stream))) + (require 'mail-utils) (defvar parse-time-months) @@ -257,10 +264,6 @@ (pop3-quit process) message-count)) -(autoload 'open-tls-stream "tls") -(autoload 'starttls-open-stream "starttls") -(autoload 'starttls-negotiate "starttls") ; avoid warning - (defcustom pop3-stream-type nil "*Transport security type for POP3 connexions. This may be either nil (plain connexion), `ssl' (use an @@ -286,64 +289,37 @@ Returns the process associated with the connection." (let ((coding-system-for-read 'binary) (coding-system-for-write 'binary) - process) + result) (with-current-buffer (get-buffer-create (concat " trace of POP session to " mailhost)) (erase-buffer) (setq pop3-read-point (point-min)) - (setq process - (cond - ((or (eq pop3-stream-type 'ssl) - (and (not pop3-stream-type) (member port '(995 "pop3s")))) - ;; gnutls-cli, openssl don't accept service names - (if (or (equal port "pop3s") - (null port)) - (setq port 995)) - (let ((process (open-tls-stream "POP" (current-buffer) - mailhost port))) - (when process - ;; There's a load of info printed that needs deleting. - (let ((again 't)) - ;; repeat until - ;; - either we received the +OK line - ;; - or accept-process-output timed out without getting - ;; anything - (while (and again - (setq again (memq (process-status process) - '(open run)))) - (setq again (pop3-accept-process-output process)) - (goto-char (point-max)) - (forward-line -1) - (cond ((looking-at "\\+OK") - (setq again nil) - (delete-region (point-min) (point))) - ((not again) - (pop3-quit process) - (error "POP SSL connexion failed"))))) - process))) - ((eq pop3-stream-type 'starttls) - ;; gnutls-cli, openssl don't accept service names - (if (equal port "pop3") - (setq port 110)) - ;; Delay STLS until server greeting is read (Bug#7438). - (starttls-open-stream "POP" (current-buffer) - mailhost (or port 110))) - (t - (open-network-stream "POP" (current-buffer) mailhost port)))) - (let ((response (pop3-read-response process t))) - (setq pop3-timestamp - (substring response (or (string-match "<" response) 0) - (+ 1 (or (string-match ">" response) -1))))) - (when (eq pop3-stream-type 'starttls) - (pop3-send-command process "STLS") - (let ((response (pop3-read-response process t))) - (if (and response (string-match "+OK" response)) - (starttls-negotiate process) - (pop3-quit process) - (error "POP server doesn't support starttls")))) - (pop3-set-process-query-on-exit-flag process nil) - process))) + (setq result + (open-protocol-stream + "POP" (current-buffer) mailhost port + :type (cond + ((or (eq pop3-stream-type 'ssl) + (and (not pop3-stream-type) + (member port '(995 "pop3s")))) + :tls) + (t + (or pop3-stream-type 'network))) + :capability-command "CAPA\r\n" + :end-of-command "^\\.\r?\n\\|^\\+[A-Z]+ .*\n" + :success "^\\+OK.*\n" + :return-list t + :starttls-function + (lambda (capabilities) + (and (string-match "\\bSTLS\\b" capabilities) + "STLS\r\n")))) + (when result + (let ((response (plist-get (cdr result) :greeting))) + (setq pop3-timestamp + (substring response (or (string-match "<" response) 0) + (+ 1 (or (string-match ">" response) -1))))) + (pop3-set-process-query-on-exit-flag (car result) nil) + (car result))))) ;; Support functions ------------------------------------------------------------ revno: 104068 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-05-01 17:39:10 +0200 message: (open-network-stream): Take a :nowait parameter and pass it on to `make-network-process'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-30 17:57:07 +0000 +++ lisp/ChangeLog 2011-05-01 15:39:10 +0000 @@ -1,3 +1,9 @@ +2011-05-01 Lars Magne Ingebrigtsen + + * net/network-stream.el (open-network-stream): Take a :nowait + parameter and pass it on to `make-network-process'. + (network-stream-open-plain): Ditto. + 2011-04-30 Andreas Schwab * faces.el (face-spec-set-match-display): Don't match toolkit === modified file 'lisp/net/network-stream.el' --- lisp/net/network-stream.el 2011-04-25 01:31:45 +0000 +++ lisp/net/network-stream.el 2011-05-01 15:39:10 +0000 @@ -109,7 +109,10 @@ :starttls-function specifies a function for handling STARTTLS. This function should take one parameter, the response to the capability command, and should return the command to switch on - STARTTLS if the server supports STARTTLS, and nil otherwise." + STARTTLS if the server supports STARTTLS, and nil otherwise. + +:nowait is a boolean that says the connection should be made +asynchronously, if possible." (unless (featurep 'make-network-process) (error "Emacs was compiled without networking support")) (let ((type (plist-get parameters :type)) @@ -121,7 +124,8 @@ (plist-get parameters :capability-command)))))) ;; The simplest case: wrapper around `make-network-process'. (make-network-process :name name :buffer buffer - :host host :service service) + :host host :service service + :nowait (plist-get parameters :nowait)) (let ((work-buffer (or buffer (generate-new-buffer " *stream buffer*"))) (fun (cond ((eq type 'plain) 'network-stream-open-plain) @@ -150,10 +154,11 @@ (defun network-stream-open-plain (name buffer host service parameters) (let ((start (with-current-buffer buffer (point))) (stream (make-network-process :name name :buffer buffer - :host host :service service))) + :host host :service service + :nowait (plist-get parameters :nowait)))) (list stream (network-stream-get-response stream start - (plist-get parameters :end-of-command)) + (plist-get parameters :end-of-command)) nil 'plain))) ------------------------------------------------------------ revno: 104067 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-05-01 06:23:07 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-04-06 02:34:56 +0000 +++ lisp/ldefs-boot.el 2011-05-01 10:23:07 +0000 @@ -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" (19845 45374)) +;;;;;; "play/5x5.el" (19889 21967)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -65,7 +65,7 @@ ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -96,7 +96,7 @@ ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -111,7 +111,7 @@ ;;;;;; 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" -;;;;;; (19860 32495)) +;;;;;; (19885 24894)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -250,7 +250,7 @@ ;;;### (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" (19863 8742)) +;;;;;; "advice" "emacs-lisp/advice.el" (19878 51661)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -395,7 +395,7 @@ ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (19845 45374)) +;;;;;; align) "align" "align.el" (19886 45771)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -979,7 +979,7 @@ ;;;*** ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules) -;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (19845 45374)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (19890 42850)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload 'antlr-show-makefile-rules "antlr-mode" "\ @@ -1015,7 +1015,7 @@ ;;;*** ;;;### (autoloads (appt-activate appt-add) "appt" "calendar/appt.el" -;;;;;; (19845 45374)) +;;;;;; (19885 24894)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1038,7 +1038,7 @@ ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (19845 45374)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (19891 63700)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1141,8 +1141,8 @@ ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1440,8 +1440,8 @@ ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload 'asm-mode "asm-mode" "\ @@ -1625,7 +1625,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (19845 45374)) +;;;;;; "autorevert" "autorevert.el" (19878 51661)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -2259,7 +2259,7 @@ ;;;;;; 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" -;;;;;; (19845 45374)) +;;;;;; (19870 57559)) ;;; 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)) "\ @@ -2581,7 +2581,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (19865 50420)) +;;;;;; "bs" "bs.el" (19870 57559)) ;;; Generated autoloads from bs.el (autoload 'bs-cycle-next "bs" "\ @@ -2621,7 +2621,7 @@ ;;;*** -;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19845 45374)) +;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19889 21967)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2643,7 +2643,7 @@ ;;;*** ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference" -;;;;;; "progmodes/bug-reference.el" (19845 45374)) +;;;;;; "progmodes/bug-reference.el" (19890 42850)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2664,7 +2664,7 @@ ;;;;;; 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" (19863 8742)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (19881 27850)) ;;; 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) @@ -2784,8 +2784,8 @@ ;;;*** -;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19845 -;;;;;; 45374)) +;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19885 +;;;;;; 24894)) ;;; Generated autoloads from calendar/cal-china.el (put 'calendar-chinese-time-zone 'risky-local-variable t) @@ -2794,7 +2794,7 @@ ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19845 45374)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19885 24894)) ;;; Generated autoloads from calendar/cal-dst.el (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -2806,7 +2806,7 @@ ;;;*** ;;;### (autoloads (calendar-hebrew-list-yahrzeits) "cal-hebrew" "calendar/cal-hebrew.el" -;;;;;; (19845 45374)) +;;;;;; (19885 24894)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\ @@ -2930,8 +2930,8 @@ ;;;*** -;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19867 -;;;;;; 52471)) +;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19885 +;;;;;; 24894)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3036,7 +3036,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (19845 45374)) +;;;;;; (19893 19022)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3530,7 +3530,7 @@ ;;;*** ;;;### (autoloads (cconv-closure-convert) "cconv" "emacs-lisp/cconv.el" -;;;;;; (19863 8742)) +;;;;;; (19869 36706)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3972,8 +3972,8 @@ ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4016,7 +4016,7 @@ ;;;### (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" -;;;;;; (19852 16697)) +;;;;;; (19888 1100)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4148,8 +4148,8 @@ ;;;;;; 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" (19845 -;;;;;; 45374)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4323,7 +4323,7 @@ ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4772,7 +4772,7 @@ ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -4862,7 +4862,7 @@ ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (19845 45374)) +;;;;;; (19894 39890)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -4921,7 +4921,7 @@ ;;;;;; customize-mode customize customize-save-variable customize-set-variable ;;;;;; customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically ;;;;;; custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5224,8 +5224,8 @@ ;;;*** ;;;### (autoloads (customize-themes describe-theme custom-theme-visit-theme -;;;;;; customize-create-theme) "cus-theme" "cus-theme.el" (19848 -;;;;;; 8443)) +;;;;;; customize-create-theme) "cus-theme" "cus-theme.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5344,7 +5344,7 @@ ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5415,8 +5415,8 @@ ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5587,7 +5587,7 @@ ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (19845 45374)) +;;;;;; (19889 21967)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5616,8 +5616,8 @@ ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (19845 -;;;;;; 45374)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from delim-col.el (autoload 'delimit-columns-customize "delim-col" "\ @@ -5641,8 +5641,8 @@ ;;;*** -;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/delphi.el (autoload 'delphi-mode "delphi" "\ @@ -5790,7 +5790,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (19845 45374)) +;;;;;; "descr-text.el" (19886 45771)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -5818,7 +5818,7 @@ ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (19845 45374)) +;;;;;; "desktop.el" (19886 45771)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6035,7 +6035,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (19845 45374)) +;;;;;; "calendar/diary-lib.el" (19885 24894)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6162,7 +6162,7 @@ ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (19865 50420)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (19886 46089)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6285,7 +6285,7 @@ ;;;*** ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6469,7 +6469,7 @@ ;;;*** -;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19845 45374)) +;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19886 45771)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\ @@ -6514,8 +6514,8 @@ ;;;*** ;;;### (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" (19863 -;;;;;; 8742)) +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19872 +;;;;;; 12877)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6558,7 +6558,7 @@ ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19845 45374)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19890 42850)) ;;; Generated autoloads from play/doctor.el (autoload 'doctor "doctor" "\ @@ -7134,8 +7134,8 @@ ;;;;;; ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition ;;;;;; ebrowse-tags-view-definition ebrowse-tags-find-declaration ;;;;;; ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree -;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19845 -;;;;;; 45374)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7309,7 +7309,7 @@ ;;;*** ;;;### (autoloads (Electric-command-history-redo-expression) "echistory" -;;;;;; "echistory.el" (19845 45374)) +;;;;;; "echistory.el" (19886 45771)) ;;; Generated autoloads from echistory.el (autoload 'Electric-command-history-redo-expression "echistory" "\ @@ -7707,7 +7707,7 @@ ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from edmacro.el (autoload 'edit-kbd-macro "edmacro" "\ @@ -7855,7 +7855,7 @@ ;;;*** ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode) -;;;;;; "electric" "electric.el" (19845 45374)) +;;;;;; "electric" "electric.el" (19886 45771)) ;;; Generated autoloads from electric.el (defvar electric-indent-chars '(10) "\ @@ -8425,7 +8425,7 @@ ;;;*** ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" -;;;;;; "erc/erc.el" (19845 45374)) +;;;;;; "erc/erc.el" (19895 48172)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8474,7 +8474,7 @@ ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19845 45374)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19895 48172)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) @@ -8493,7 +8493,7 @@ ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (19845 45374)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (19895 48172)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8601,13 +8601,6 @@ ;;;*** -;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (19845 -;;;;;; 45374)) -;;; Generated autoloads from erc/erc-hecomplete.el - (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t) - -;;;*** - ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd" ;;;;;; "erc/erc-identd.el" (19845 45374)) ;;; Generated autoloads from erc/erc-identd.el @@ -8793,8 +8786,8 @@ ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19845 -;;;;;; 45374)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19899 +;;;;;; 57784)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) @@ -9000,8 +8993,8 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9055,7 +9048,7 @@ ;;;;;; 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" -;;;;;; (19845 45374)) +;;;;;; (19893 19022)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9688,7 +9681,7 @@ ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -9731,7 +9724,7 @@ ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot ;;;;;; expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ @@ -9780,7 +9773,7 @@ ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19860 32495)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19882 48702)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10165,7 +10158,7 @@ ;;;;;; copy-file-locals-to-dir-locals delete-dir-local-variable ;;;;;; add-dir-local-variable delete-file-local-variable-prop-line ;;;;;; add-file-local-variable-prop-line delete-file-local-variable -;;;;;; add-file-local-variable) "files-x" "files-x.el" (19845 45374)) +;;;;;; add-file-local-variable) "files-x" "files-x.el" (19886 45771)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10551,7 +10544,7 @@ ;;;*** ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories -;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (19845 45374)) +;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (19886 45771)) ;;; Generated autoloads from find-lisp.el (autoload 'find-lisp-find-dired "find-lisp" "\ @@ -10572,7 +10565,7 @@ ;;;*** ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords) -;;;;;; "finder" "finder.el" (19845 45374)) +;;;;;; "finder" "finder.el" (19893 19022)) ;;; Generated autoloads from finder.el (autoload 'finder-list-keywords "finder" "\ @@ -10632,7 +10625,7 @@ ;;;*** ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode) -;;;;;; "flymake" "progmodes/flymake.el" (19845 45374)) +;;;;;; "flymake" "progmodes/flymake.el" (19890 42850)) ;;; Generated autoloads from progmodes/flymake.el (autoload 'flymake-mode "flymake" "\ @@ -10726,7 +10719,7 @@ ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (19863 8742)) +;;;;;; (19886 45771)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -10814,7 +10807,7 @@ ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (19845 45374)) +;;;;;; "forms" "forms.el" (19886 45771)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -10851,7 +10844,7 @@ ;;;*** ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -10929,7 +10922,7 @@ ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (19845 45374)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (19889 21967)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -10978,7 +10971,7 @@ ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (19849 29307)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11117,7 +11110,7 @@ ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/glasses.el (autoload 'glasses-mode "glasses" "\ @@ -11186,7 +11179,7 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19860 32495)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (19889 21967)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11330,7 +11323,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (19849 29307)) +;;;;;; (19874 54611)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11472,7 +11465,7 @@ ;;;*** ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el" -;;;;;; (19845 45374)) +;;;;;; (19881 27850)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload 'gnus-draft-reminder "gnus-draft" "\ @@ -11844,7 +11837,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (19867 52471)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (19893 19022)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -11900,7 +11893,7 @@ ;;;*** ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" -;;;;;; (19867 5739)) +;;;;;; (19877 30798)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -11911,7 +11904,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (19867 5739)) +;;;;;; (19890 42850)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -11949,7 +11942,7 @@ ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19845 45374)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19889 21967)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12205,7 +12198,7 @@ ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19845 45374)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19890 42850)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12291,8 +12284,8 @@ ;;;*** -;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19889 +;;;;;; 21967)) ;;; Generated autoloads from play/handwrite.el (autoload 'handwrite "handwrite" "\ @@ -12310,7 +12303,7 @@ ;;;*** ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el" -;;;;;; (19845 45374)) +;;;;;; (19889 21967)) ;;; Generated autoloads from play/hanoi.el (autoload 'hanoi "hanoi" "\ @@ -12514,7 +12507,7 @@ ;;;### (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" (19867 5739)) +;;;;;; "help-fns" "help-fns.el" (19878 51661)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -12610,8 +12603,8 @@ ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button ;;;;;; help-make-xrefs help-buffer help-setup-xref help-mode-finish -;;;;;; help-mode-setup help-mode) "help-mode" "help-mode.el" (19849 -;;;;;; 62189)) +;;;;;; help-mode-setup help-mode) "help-mode" "help-mode.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -12951,7 +12944,7 @@ ;;;*** ;;;### (autoloads (hide-ifdef-mode) "hideif" "progmodes/hideif.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -12991,7 +12984,7 @@ ;;;*** ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; 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))) "\ @@ -13053,8 +13046,8 @@ ;;;;;; 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" (19845 -;;;;;; 45374)) +;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13300,7 +13293,7 @@ ;;;;;; holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays ;;;;;; holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays ;;;;;; holiday-oriental-holidays holiday-general-holidays) "holidays" -;;;;;; "calendar/holidays.el" (19845 45374)) +;;;;;; "calendar/holidays.el" (19882 48702)) ;;; Generated autoloads from calendar/holidays.el (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1") @@ -13460,7 +13453,7 @@ ;;;*** ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer) -;;;;;; "htmlfontify" "htmlfontify.el" (19845 45374)) +;;;;;; "htmlfontify" "htmlfontify.el" (19886 45771)) ;;; Generated autoloads from htmlfontify.el (autoload 'htmlfontify-buffer "htmlfontify" "\ @@ -13591,7 +13584,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (19845 45374)) +;;;;;; "ibuffer" "ibuffer.el" (19886 45771)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -13632,7 +13625,7 @@ ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (19845 45374)) +;;;;;; "calendar/icalendar.el" (19897 16090)) ;;; Generated autoloads from calendar/icalendar.el (autoload 'icalendar-export-file "icalendar" "\ @@ -13684,8 +13677,8 @@ ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19874 +;;;;;; 54611)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -13706,7 +13699,7 @@ ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19845 45374)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19890 42850)) ;;; Generated autoloads from progmodes/icon.el (autoload 'icon-mode "icon" "\ @@ -13907,8 +13900,8 @@ ;;;;;; 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" (19857 -;;;;;; 56304)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14169,7 +14162,7 @@ ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (19863 8742)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (19886 45771)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names (purecopy "*ielm*")) @@ -14404,7 +14397,7 @@ ;;;;;; 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" (19845 45374)) +;;;;;; "image-dired" "image-dired.el" (19886 45771)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -14604,7 +14597,7 @@ ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (19845 45374)) +;;;;;; image-mode) "image-mode" "image-mode.el" (19890 42850)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15098,7 +15091,7 @@ ;;;### (autoloads (info-xref-docstrings info-xref-check-all-custom ;;;;;; info-xref-check-all info-xref-check) "info-xref" "info-xref.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from info-xref.el (autoload 'info-xref-check "info-xref" "\ @@ -15181,7 +15174,7 @@ ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold -;;;;;; Info-tagify) "informat" "informat.el" (19845 45374)) +;;;;;; Info-tagify) "informat" "informat.el" (19886 45771)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15588,8 +15581,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -15692,7 +15685,7 @@ ;;;*** ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (19845 45374)) +;;;;;; "jka-compr.el" (19886 45771)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -15715,7 +15708,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19845 45374)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19890 42850)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -15832,7 +15825,7 @@ ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item) -;;;;;; "kmacro" "kmacro.el" (19845 45374)) +;;;;;; "kmacro" "kmacro.el" (19886 45771)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -15958,7 +15951,7 @@ ;;;*** ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el" -;;;;;; (19845 45374)) +;;;;;; (19889 21967)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16234,7 +16227,7 @@ ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (19845 45374)) +;;;;;; "locate" "locate.el" (19886 45771)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -16286,7 +16279,7 @@ ;;;*** -;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (19863 8742)) +;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (19870 57559)) ;;; Generated autoloads from vc/log-edit.el (autoload 'log-edit "log-edit" "\ @@ -16324,8 +16317,8 @@ ;;;*** -;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from longlines.el (autoload 'longlines-mode "longlines" "\ @@ -16441,7 +16434,7 @@ ;;;*** ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16493,7 +16486,7 @@ ;;;*** ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro -;;;;;; name-last-kbd-macro) "macros" "macros.el" (19845 45374)) +;;;;;; name-last-kbd-macro) "macros" "macros.el" (19886 45771)) ;;; Generated autoloads from macros.el (autoload 'name-last-kbd-macro "macros" "\ @@ -16760,9 +16753,9 @@ ;;;*** -;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases -;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (mail-complete mail-completion-at-point-function +;;;;;; define-mail-alias expand-mail-aliases mail-complete-style) +;;;;;; "mailalias" "mail/mailalias.el" (19881 27850)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style 'angles "\ @@ -16798,10 +16791,16 @@ \(fn NAME DEFINITION &optional FROM-MAILRC-FILE)" t nil) +(autoload 'mail-completion-at-point-function "mailalias" "\ +Compute completion data for mail aliases. +For use on `completion-at-point-functions'. + +\(fn)" nil nil) + (autoload 'mail-complete "mailalias" "\ Perform completion on header field or word preceding point. Completable headers are according to `mail-complete-alist'. If none matches -current header, calls `mail-complete-function' and passes prefix arg if any. +current header, calls `mail-complete-function' and passes prefix ARG if any. \(fn ARG)" t nil) @@ -16822,7 +16821,7 @@ ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (19845 45374)) +;;;;;; "make-mode" "progmodes/make-mode.el" (19890 42850)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -16939,8 +16938,8 @@ ;;;*** -;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from makesum.el (autoload 'make-command-summary "makesum" "\ @@ -16952,7 +16951,7 @@ ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (19845 45374)) +;;;;;; (19870 57559)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17060,7 +17059,7 @@ ;;;;;; 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" (19860 32495)) +;;;;;; "gnus/message.el" (19881 27850)) ;;; 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) @@ -17378,7 +17377,7 @@ ;;;*** -;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19845 45374)) +;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19898 36953)) ;;; Generated autoloads from mh-e/mh-e.el (put 'mh-progs 'risky-local-variable t) @@ -17550,7 +17549,7 @@ ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files ;;;;;; multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup) -;;;;;; "misearch" "misearch.el" (19845 45374)) +;;;;;; "misearch" "misearch.el" (19886 45771)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -17676,7 +17675,7 @@ ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (19845 45374)) +;;;;;; "mm-url" "gnus/mm-url.el" (19877 30798)) ;;; Generated autoloads from gnus/mm-url.el (autoload 'mm-url-insert-file-contents "mm-url" "\ @@ -17805,7 +17804,7 @@ ;;;*** ;;;### (autoloads (denato-region nato-region unmorse-region morse-region) -;;;;;; "morse" "play/morse.el" (19845 45374)) +;;;;;; "morse" "play/morse.el" (19869 36706)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -17831,7 +17830,7 @@ ;;;*** ;;;### (autoloads (mouse-drag-drag mouse-drag-throw) "mouse-drag" -;;;;;; "mouse-drag.el" (19845 45374)) +;;;;;; "mouse-drag.el" (19890 42850)) ;;; Generated autoloads from mouse-drag.el (autoload 'mouse-drag-throw "mouse-drag" "\ @@ -17842,7 +17841,7 @@ you'll like it. It's easier to observe than to explain. If the mouse is clicked and released in the same place of time we -assume that the user didn't want to scdebugroll but wanted to whatever +assume that the user didn't want to scroll but wanted to whatever mouse-2 used to do, so we pass it through. Throw scrolling was inspired (but is not identical to) the \"hand\" @@ -17878,8 +17877,8 @@ ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -17941,7 +17940,7 @@ ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19845 45374)) +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19890 42850)) ;;; Generated autoloads from play/mpuz.el (autoload 'mpuz "mpuz" "\ @@ -18364,7 +18363,7 @@ ;;;*** ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el" -;;;;;; (19864 29553)) +;;;;;; (19893 19022)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19169,7 +19168,7 @@ ;;;*** ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el" -;;;;;; (19845 45374)) +;;;;;; (19894 39890)) ;;; Generated autoloads from progmodes/octave-inf.el (autoload 'inferior-octave "octave-inf" "\ @@ -19192,7 +19191,7 @@ ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (19845 45374)) +;;;;;; (19894 39890)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload 'octave-mode "octave-mod" "\ @@ -20768,7 +20767,7 @@ ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20829,7 +20828,7 @@ ;;;### (autoloads (list-packages describe-package package-initialize ;;;;;; package-install-file package-install-from-buffer package-install ;;;;;; package-enable-at-startup) "package" "emacs-lisp/package.el" -;;;;;; (19864 29553)) +;;;;;; (19893 19022)) ;;; Generated autoloads from emacs-lisp/package.el (defvar package-enable-at-startup t "\ @@ -20882,10 +20881,11 @@ (autoload 'list-packages "package" "\ Display a list of packages. -Fetches the updated list of packages before displaying. +This first fetches the updated list of packages before +displaying, unless a prefix argument NO-FETCH is specified. The list is displayed in a buffer named `*Packages*'. -\(fn)" t nil) +\(fn &optional NO-FETCH)" t nil) (defalias 'package-list-packages 'list-packages) @@ -20929,8 +20929,8 @@ ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19899 +;;;;;; 57784)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -21194,8 +21194,8 @@ ;;;### (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" (19845 -;;;;;; 45374)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19899 +;;;;;; 57784)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -21337,7 +21337,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -22175,7 +22175,7 @@ ;;;*** -;;;### (autoloads (proced) "proced" "proced.el" (19845 45374)) +;;;### (autoloads (proced) "proced" "proced.el" (19886 45771)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -22191,7 +22191,7 @@ ;;;*** ;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog" -;;;;;; "progmodes/prolog.el" (19845 45374)) +;;;;;; "progmodes/prolog.el" (19890 42850)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -22238,8 +22238,8 @@ ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload 'ps-mode "ps-mode" "\ @@ -22290,8 +22290,8 @@ ;;;;;; 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" (19845 -;;;;;; 45374)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (19886 +;;;;;; 45771)) ;;; 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 +22488,7 @@ ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (19860 32495)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode)) @@ -22895,7 +22895,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (19867 5739)) +;;;;;; "net/rcirc.el" (19898 36953)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22955,7 +22955,7 @@ ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19845 45374)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19886 45771)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22983,7 +22983,7 @@ ;;;;;; string-rectangle delete-whitespace-rectangle open-rectangle ;;;;;; insert-rectangle yank-rectangle kill-rectangle extract-rectangle ;;;;;; delete-extract-rectangle delete-rectangle) "rect" "rect.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from rect.el (define-key ctl-x-r-map "c" 'clear-rectangle) (define-key ctl-x-r-map "k" 'kill-rectangle) @@ -23483,7 +23483,7 @@ ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19845 45374)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19870 57559)) ;;; Generated autoloads from net/rlogin.el (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")) @@ -24319,8 +24319,8 @@ ;;;*** -;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from savehist.el (defvar savehist-mode nil "\ @@ -24500,7 +24500,7 @@ ;;;;;; 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" (19845 45374)) +;;;;;; mail-from-style) "sendmail" "mail/sendmail.el" (19881 27850)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24928,7 +24928,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -25057,8 +25057,8 @@ ;;;*** ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group -;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (19845 -;;;;;; 45374)) +;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from shadowfile.el (autoload 'shadow-define-cluster "shadowfile" "\ @@ -25097,7 +25097,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (19845 45374)) +;;;;;; (19888 1100)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -25146,8 +25146,8 @@ ;;;*** -;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19899 +;;;;;; 57784)) ;;; Generated autoloads from gnus/shr.el (autoload 'shr-insert-document "shr" "\ @@ -25194,8 +25194,8 @@ ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19890 +;;;;;; 42850)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -25465,8 +25465,8 @@ ;;;*** -;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from calendar/solar.el (autoload 'sunrise-sunset "solar" "\ @@ -25481,8 +25481,8 @@ ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19889 +;;;;;; 21967)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -25763,7 +25763,7 @@ ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (19845 45374)) +;;;;;; "speedbar.el" (19886 45771)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -25807,7 +25807,7 @@ ;;;;;; 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" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -26343,8 +26343,8 @@ ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (19845 -;;;;;; 45374)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -27206,7 +27206,50 @@ ;;;*** -;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19845 45374)) +;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el" +;;;;;; (19885 24894)) +;;; Generated autoloads from emacs-lisp/tabulated-list.el + +(autoload 'tabulated-list-mode "tabulated-list" "\ +Generic major mode for browsing a list of items. +This mode is usually not used directly; instead, other major +modes are derived from it, using `define-derived-mode'. + +In this major mode, the buffer is divided into multiple columns, +which are labelled using the header line. Each non-empty line +belongs to one \"entry\", and the entries can be sorted according +to their column values. + +An inheriting mode should usually do the following in their body: + + - Set `tabulated-list-format', specifying the column format. + - Set `tabulated-list-revert-hook', if the buffer contents need + to be specially recomputed prior to `revert-buffer'. + - Maybe set a `tabulated-list-entries' function (see below). + - Maybe set `tabulated-list-printer' (see below). + - Maybe set `tabulated-list-padding'. + - Call `tabulated-list-init-header' to initialize `header-line-format' + according to `tabulated-list-format'. + +An inheriting mode is usually accompanied by a \"list-FOO\" +command (e.g. `list-packages', `list-processes'). This command +creates or switches to a buffer and enables the major mode in +that buffer. If `tabulated-list-entries' is not a function, the +command should initialize it to a list of entries for displaying. +Finally, it should call `tabulated-list-print'. + +`tabulated-list-print' calls the printer function specified by +`tabulated-list-printer', once for each entry. The default +printer is `tabulated-list-print-entry', but a mode that keeps +data in an ewoc may instead specify a printer function (e.g., one +that calls `ewoc-enter-last'), with `tabulated-list-print-entry' +as the ewoc pretty-printer. + +\(fn)" t nil) + +;;;*** + +;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19886 45771)) ;;; Generated autoloads from talk.el (autoload 'talk-connect "talk" "\ @@ -27221,7 +27264,7 @@ ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19845 45374)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19886 45771)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -27245,7 +27288,7 @@ ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (19845 45374)) +;;;;;; "progmodes/tcl.el" (19890 42850)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -27363,8 +27406,8 @@ ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from terminal.el (autoload 'terminal-emulator "terminal" "\ @@ -27411,7 +27454,7 @@ ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19845 45374)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19889 21967)) ;;; Generated autoloads from play/tetris.el (autoload 'tetris "tetris" "\ @@ -28094,7 +28137,7 @@ ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world ;;;;;; display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (19845 45374)) +;;;;;; "time" "time.el" (19886 45771)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -28159,7 +28202,7 @@ ;;;;;; time-to-day-in-year date-leap-year-p days-between date-to-day ;;;;;; time-add time-subtract time-since days-to-time time-less-p ;;;;;; seconds-to-time date-to-time) "time-date" "calendar/time-date.el" -;;;;;; (19845 45374)) +;;;;;; (19885 24894)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -28273,7 +28316,7 @@ ;;;*** ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp" -;;;;;; "time-stamp.el" (19845 45374)) +;;;;;; "time-stamp.el" (19886 45771)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -28540,7 +28583,7 @@ ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu ;;;;;; tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame) -;;;;;; "tool-bar" "tool-bar.el" (19845 45374)) +;;;;;; "tool-bar" "tool-bar.el" (19886 45771)) ;;; Generated autoloads from tool-bar.el (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\ @@ -28723,7 +28766,7 @@ ;;;### (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" (19845 45374)) +;;;;;; "net/tramp.el" (19894 39890)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28959,7 +29002,7 @@ ;;;;;; 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" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -29494,7 +29537,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (19845 45374)) +;;;;;; url-http) "url-http" "url/url-http.el" (19882 48702)) ;;; Generated autoloads from url/url-http.el (autoload 'url-http "url-http" "\ @@ -29725,7 +29768,7 @@ ;;;;;; url-pretty-length url-strip-leading-spaces url-eat-trailing-space ;;;;;; url-get-normalized-date url-lazy-message url-normalize-url ;;;;;; url-insert-entities-in-string url-parse-args url-debug url-debug) -;;;;;; "url-util" "url/url-util.el" (19845 45374)) +;;;;;; "url-util" "url/url-util.el" (19867 59212)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -29956,9 +29999,10 @@ ;;;;;; vc-delete-file vc-transfer-file vc-switch-backend vc-pull ;;;;;; vc-rollback vc-revert vc-log-outgoing vc-log-incoming vc-print-root-log ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers -;;;;;; vc-revision-other-window vc-root-diff vc-diff vc-version-diff -;;;;;; vc-register vc-next-action vc-before-checkin-hook vc-checkin-hook -;;;;;; vc-checkout-hook) "vc" "vc/vc.el" (19845 45374)) +;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff +;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (19888 +;;;;;; 1100)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -30044,6 +30088,23 @@ \(fn HISTORIC &optional NOT-URGENT)" t nil) +(autoload 'vc-version-ediff "vc" "\ +Show differences between revisions of the fileset in the +repository history using ediff. + +\(fn FILES REV1 REV2)" t nil) + +(autoload 'vc-ediff "vc" "\ +Display diffs between file revisions using ediff. +Normally this compares the currently selected fileset with their +working revisions. With a prefix argument HISTORIC, it reads two revision +designators specifying which revisions to compare. + +The optional argument NOT-URGENT non-nil means it is ok to say no to +saving the buffer. + +\(fn HISTORIC &optional NOT-URGENT)" t nil) + (autoload 'vc-root-diff "vc" "\ Display diffs between VC-controlled whole tree revisions. Normally, this compares the tree corresponding to the current @@ -30224,7 +30285,7 @@ ;;;*** ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el" -;;;;;; (19845 45374)) +;;;;;; (19893 19022)) ;;; Generated autoloads from vc/vc-annotate.el (autoload 'vc-annotate "vc-annotate" "\ @@ -30426,7 +30487,7 @@ ;;;*** ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el" -;;;;;; (19845 45374)) +;;;;;; (19890 42850)) ;;; Generated autoloads from progmodes/vera-mode.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -31265,7 +31326,7 @@ ;;;;;; view-mode view-buffer-other-frame view-buffer-other-window ;;;;;; view-buffer view-file-other-frame view-file-other-window ;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting) -;;;;;; "view" "view.el" (19845 45374)) +;;;;;; "view" "view.el" (19886 45771)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -31635,7 +31696,7 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from wdired.el (autoload 'wdired-change-to-wdired-mode "wdired" "\ @@ -31699,7 +31760,7 @@ ;;;### (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" (19845 45374)) +;;;;;; whitespace-mode) "whitespace" "whitespace.el" (19901 13134)) ;;; Generated autoloads from whitespace.el (autoload 'whitespace-mode "whitespace" "\ @@ -32102,7 +32163,7 @@ ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (19845 45374)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (19886 45771)) ;;; Generated autoloads from wid-browse.el (autoload 'widget-browse-at "wid-browse" "\ @@ -32129,8 +32190,8 @@ ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19845 -;;;;;; 45374)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -32173,8 +32234,8 @@ ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (19845 -;;;;;; 45374)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -32246,7 +32307,7 @@ ;;;*** ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file -;;;;;; woman woman-locale) "woman" "woman.el" (19845 45374)) +;;;;;; woman woman-locale) "woman" "woman.el" (19886 45771)) ;;; Generated autoloads from woman.el (defvar woman-locale nil "\ @@ -32427,7 +32488,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (19845 45374)) +;;;;;; (19886 45771)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -32471,8 +32532,8 @@ ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19845 -;;;;;; 45374)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19886 +;;;;;; 45771)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ @@ -32543,7 +32604,7 @@ ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (19845 45374)) +;;;### (autoloads (zone) "zone" "play/zone.el" (19889 21967)) ;;; Generated autoloads from play/zone.el (autoload 'zone "zone" "\ @@ -32559,47 +32620,46 @@ ;;;;;; "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-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" +;;;;;; "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" ;;;;;; "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" @@ -32607,13 +32667,13 @@ ;;;;;; "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/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/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/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" @@ -32625,33 +32685,32 @@ ;;;;;; "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/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" +;;;;;; "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-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" @@ -32754,8 +32813,8 @@ ;;;;;; "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") (19867 -;;;;;; 53579 794540)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19901 +;;;;;; 13383 538856)) ;;;*** ------------------------------------------------------------ revno: 104066 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2011-05-01 11:02:01 +0200 message: * src/callproc.c: Indentation fixup. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-01 08:52:17 +0000 +++ src/ChangeLog 2011-05-01 09:02:01 +0000 @@ -1,5 +1,7 @@ 2011-05-01 Andreas Schwab + * callproc.c: Indentation fixup. + * sysdep.c (wait_for_termination_1): Make static. (wait_for_termination, interruptible_wait_for_termination): Move after wait_for_termination_1. === modified file 'src/callproc.c' --- src/callproc.c 2011-05-01 00:04:17 +0000 +++ src/callproc.c 2011-05-01 09:02:01 +0000 @@ -1,6 +1,6 @@ /* Synchronous subprocess invocation for GNU Emacs. Copyright (C) 1985-1988, 1993-1995, 1999-2011 - Free Software Foundation, Inc. + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -280,9 +280,9 @@ /* If BUFFER is a list, its meaning is (BUFFER-FOR-STDOUT FILE-FOR-STDERR), unless the first element is :file, in which case see the next paragraph. */ - if (CONSP (buffer) && - (! SYMBOLP (XCAR (buffer)) || - strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file"))) + if (CONSP (buffer) + && (! SYMBOLP (XCAR (buffer)) + || strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file"))) { if (CONSP (XCDR (buffer))) { @@ -299,9 +299,9 @@ } /* If the buffer is (still) a list, it might be a (:file "file") spec. */ - if (CONSP (buffer) && - SYMBOLP (XCAR (buffer)) && - ! strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file")) + if (CONSP (buffer) + && SYMBOLP (XCAR (buffer)) + && ! strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file")) { output_file = Fexpand_file_name (XCAR (XCDR (buffer)), BVAR (current_buffer, directory)); @@ -388,9 +388,9 @@ output_file = DECODE_FILE (output_file); report_file_error ("Opening process output file", Fcons (output_file, Qnil)); - } + } if (STRINGP (error_file) || NILP (error_file)) - output_to_buffer = 0; + output_to_buffer = 0; } /* Search for program; barf if not found. */ @@ -599,12 +599,12 @@ if (fd[0] >= 0) emacs_close (fd[0]); #ifdef HAVE_SETSID - setsid (); + setsid (); #endif #if defined (USG) - setpgrp (); + setpgrp (); #else - setpgrp (pid, pid); + setpgrp (pid, pid); #endif /* USG */ /* GConf causes us to ignore SIGPIPE, make sure it is restored @@ -723,132 +723,132 @@ QUIT; if (output_to_buffer) - { - register EMACS_INT nread; - int first = 1; - EMACS_INT total_read = 0; - int carryover = 0; - int display_p = display_p_volatile; - int display_on_the_fly = display_p; - struct coding_system saved_coding; - - saved_coding = process_coding; - while (1) - { - /* Repeatedly read until we've filled as much as possible - of the buffer size we have. But don't read - less than 1024--save that for the next bufferful. */ - nread = carryover; - while (nread < bufsize - 1024) - { - int this_read = emacs_read (fd[0], buf + nread, - bufsize - nread); - - if (this_read < 0) - goto give_up; - - if (this_read == 0) - { - process_coding.mode |= CODING_MODE_LAST_BLOCK; + { + register EMACS_INT nread; + int first = 1; + EMACS_INT total_read = 0; + int carryover = 0; + int display_p = display_p_volatile; + int display_on_the_fly = display_p; + struct coding_system saved_coding; + + saved_coding = process_coding; + while (1) + { + /* Repeatedly read until we've filled as much as possible + of the buffer size we have. But don't read + less than 1024--save that for the next bufferful. */ + nread = carryover; + while (nread < bufsize - 1024) + { + int this_read = emacs_read (fd[0], buf + nread, + bufsize - nread); + + if (this_read < 0) + goto give_up; + + if (this_read == 0) + { + process_coding.mode |= CODING_MODE_LAST_BLOCK; + break; + } + + nread += this_read; + total_read += this_read; + + if (display_on_the_fly) break; - } - - nread += this_read; - total_read += this_read; - - if (display_on_the_fly) - break; - } - - /* Now NREAD is the total amount of data in the buffer. */ - immediate_quit = 0; - - if (!NILP (buffer)) - { - if (NILP (BVAR (current_buffer, enable_multibyte_characters)) - && ! CODING_MAY_REQUIRE_DECODING (&process_coding)) - insert_1_both (buf, nread, nread, 0, 1, 0); - else - { /* We have to decode the input. */ - Lisp_Object curbuf; - int count1 = SPECPDL_INDEX (); - - XSETBUFFER (curbuf, current_buffer); - /* We cannot allow after-change-functions be run - during decoding, because that might modify the - buffer, while we rely on process_coding.produced to - faithfully reflect inserted text until we - TEMP_SET_PT_BOTH below. */ - specbind (Qinhibit_modification_hooks, Qt); - decode_coding_c_string (&process_coding, (unsigned char *) buf, - nread, curbuf); - unbind_to (count1, Qnil); - if (display_on_the_fly - && CODING_REQUIRE_DETECTION (&saved_coding) - && ! CODING_REQUIRE_DETECTION (&process_coding)) - { - /* We have detected some coding system. But, - there's a possibility that the detection was - done by insufficient data. So, we give up - displaying on the fly. */ - if (process_coding.produced > 0) - del_range_2 (process_coding.dst_pos, - process_coding.dst_pos_byte, - process_coding.dst_pos - + process_coding.produced_char, - process_coding.dst_pos_byte - + process_coding.produced, 0); - display_on_the_fly = 0; - process_coding = saved_coding; - carryover = nread; - /* This is to make the above condition always - fails in the future. */ - saved_coding.common_flags - &= ~CODING_REQUIRE_DETECTION_MASK; - continue; - } - - TEMP_SET_PT_BOTH (PT + process_coding.produced_char, - PT_BYTE + process_coding.produced); - carryover = process_coding.carryover_bytes; - if (carryover > 0) - memcpy (buf, process_coding.carryover, - process_coding.carryover_bytes); - } - } - - if (process_coding.mode & CODING_MODE_LAST_BLOCK) - break; - - /* Make the buffer bigger as we continue to read more data, - but not past CALLPROC_BUFFER_SIZE_MAX. */ - if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize) - if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX) - bufsize = CALLPROC_BUFFER_SIZE_MAX; - - if (display_p) - { - if (first) - prepare_menu_bars (); - first = 0; - redisplay_preserve_echo_area (1); - /* This variable might have been set to 0 for code - detection. In that case, we set it back to 1 because - we should have already detected a coding system. */ - display_on_the_fly = 1; - } - immediate_quit = 1; - QUIT; - } - give_up: ; - - Vlast_coding_system_used = CODING_ID_NAME (process_coding.id); - /* If the caller required, let the buffer inherit the - coding-system used to decode the process output. */ - if (inherit_process_coding_system) - call1 (intern ("after-insert-file-set-buffer-file-coding-system"), - make_number (total_read)); - } + } + + /* Now NREAD is the total amount of data in the buffer. */ + immediate_quit = 0; + + if (!NILP (buffer)) + { + if (NILP (BVAR (current_buffer, enable_multibyte_characters)) + && ! CODING_MAY_REQUIRE_DECODING (&process_coding)) + insert_1_both (buf, nread, nread, 0, 1, 0); + else + { /* We have to decode the input. */ + Lisp_Object curbuf; + int count1 = SPECPDL_INDEX (); + + XSETBUFFER (curbuf, current_buffer); + /* We cannot allow after-change-functions be run + during decoding, because that might modify the + buffer, while we rely on process_coding.produced to + faithfully reflect inserted text until we + TEMP_SET_PT_BOTH below. */ + specbind (Qinhibit_modification_hooks, Qt); + decode_coding_c_string (&process_coding, + (unsigned char *) buf, nread, curbuf); + unbind_to (count1, Qnil); + if (display_on_the_fly + && CODING_REQUIRE_DETECTION (&saved_coding) + && ! CODING_REQUIRE_DETECTION (&process_coding)) + { + /* We have detected some coding system. But, + there's a possibility that the detection was + done by insufficient data. So, we give up + displaying on the fly. */ + if (process_coding.produced > 0) + del_range_2 (process_coding.dst_pos, + process_coding.dst_pos_byte, + process_coding.dst_pos + + process_coding.produced_char, + process_coding.dst_pos_byte + + process_coding.produced, 0); + display_on_the_fly = 0; + process_coding = saved_coding; + carryover = nread; + /* This is to make the above condition always + fails in the future. */ + saved_coding.common_flags + &= ~CODING_REQUIRE_DETECTION_MASK; + continue; + } + + TEMP_SET_PT_BOTH (PT + process_coding.produced_char, + PT_BYTE + process_coding.produced); + carryover = process_coding.carryover_bytes; + if (carryover > 0) + memcpy (buf, process_coding.carryover, + process_coding.carryover_bytes); + } + } + + if (process_coding.mode & CODING_MODE_LAST_BLOCK) + break; + + /* Make the buffer bigger as we continue to read more data, + but not past CALLPROC_BUFFER_SIZE_MAX. */ + if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize) + if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX) + bufsize = CALLPROC_BUFFER_SIZE_MAX; + + if (display_p) + { + if (first) + prepare_menu_bars (); + first = 0; + redisplay_preserve_echo_area (1); + /* This variable might have been set to 0 for code + detection. In that case, we set it back to 1 because + we should have already detected a coding system. */ + display_on_the_fly = 1; + } + immediate_quit = 1; + QUIT; + } + give_up: ; + + Vlast_coding_system_used = CODING_ID_NAME (process_coding.id); + /* If the caller required, let the buffer inherit the + coding-system used to decode the process output. */ + if (inherit_process_coding_system) + call1 (intern ("after-insert-file-set-buffer-file-coding-system"), + make_number (total_read)); + } #ifndef MSDOS /* Wait for it to terminate, unless it already has. */ @@ -875,7 +875,7 @@ signame = strsignal (synch_process_termsig); if (signame == 0) - signame = "unknown"; + signame = "unknown"; synch_process_death = signame; } @@ -1058,18 +1058,18 @@ { char *p = *ep, *q = string; while (ok) - { - if (*q != *p) - break; - if (*q == 0) - /* The string is a lone variable name; keep it for now, we - will remove it later. It is a placeholder for a - variable that is not to be included in the environment. */ - break; - if (*q == '=') - ok = 0; - p++, q++; - } + { + if (*q != *p) + break; + if (*q == 0) + /* The string is a lone variable name; keep it for now, we + will remove it later. It is a placeholder for a + variable that is not to be included in the environment. */ + break; + if (*q == '=') + ok = 0; + p++, q++; + } } if (ok) *new_env++ = string; @@ -1173,8 +1173,8 @@ new_length = 0; for (tem = Vprocess_environment; - CONSP (tem) && STRINGP (XCAR (tem)); - tem = XCDR (tem)) + CONSP (tem) && STRINGP (XCAR (tem)); + tem = XCDR (tem)) { if (strncmp (SSDATA (XCAR (tem)), "DISPLAY", 7) == 0 && (SDATA (XCAR (tem)) [7] == '\0' @@ -1227,11 +1227,11 @@ p = q = env; while (*p != 0) { - while (*q != 0 && strchr (*q, '=') == NULL) - q++; - *p = *q++; - if (*p != 0) - p++; + while (*q != 0 && strchr (*q, '=') == NULL) + q++; + *p = *q++; + if (*p != 0) + p++; } } ------------------------------------------------------------ revno: 104065 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2011-05-01 10:52:17 +0200 message: * src/sysdep.c (wait_for_termination_1): Make static. (wait_for_termination, interruptible_wait_for_termination): Move after wait_for_termination_1. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-01 00:04:17 +0000 +++ src/ChangeLog 2011-05-01 08:52:17 +0000 @@ -1,3 +1,9 @@ +2011-05-01 Andreas Schwab + + * sysdep.c (wait_for_termination_1): Make static. + (wait_for_termination, interruptible_wait_for_termination): Move + after wait_for_termination_1. + 2011-05-01 Lars Magne Ingebrigtsen * sysdep.c (interruptible_wait_for_termination): New function === modified file 'src/sysdep.c' --- src/sysdep.c 2011-05-01 00:04:17 +0000 +++ src/sysdep.c 2011-05-01 08:52:17 +0000 @@ -296,23 +296,8 @@ int wait_debugging EXTERNALLY_VISIBLE; #ifndef MSDOS -/* Wait for subprocess with process id `pid' to terminate and - make sure it will get eliminated (not remain forever as a zombie) */ - -void -wait_for_termination (int pid) -{ - wait_for_termination_1 (pid, 0); -} - -/* Like the above, but allow keyboard interruption. */ -void -interruptible_wait_for_termination (int pid) -{ - wait_for_termination_1 (pid, 1); -} - -void + +static void wait_for_termination_1 (int pid, int interruptible) { while (1) @@ -357,6 +342,22 @@ } } +/* Wait for subprocess with process id `pid' to terminate and + make sure it will get eliminated (not remain forever as a zombie) */ + +void +wait_for_termination (int pid) +{ + wait_for_termination_1 (pid, 0); +} + +/* Like the above, but allow keyboard interruption. */ +void +interruptible_wait_for_termination (int pid) +{ + wait_for_termination_1 (pid, 1); +} + /* * flush any pending output * (may flush input as well; it does not matter the way we use it) ------------------------------------------------------------ revno: 104064 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2011-05-01 02:04:17 +0200 message: Extend `call-process' to take the `(:file "file")' syntax to redirect STDOUT to a file. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-04-23 03:07:16 +0000 +++ doc/lispref/ChangeLog 2011-05-01 00:04:17 +0000 @@ -1,3 +1,8 @@ +2011-04-30 Lars Magne Ingebrigtsen + + * processes.texi (Synchronous Processes): Document the (:file + "/file-name") syntax for `call-process'. + 2011-04-23 Juanma Barranquero * windows.texi (Choosing Window): Fix typo. === modified file 'doc/lispref/processes.texi' --- doc/lispref/processes.texi 2011-03-05 20:45:09 +0000 +++ doc/lispref/processes.texi 2011-05-01 00:04:17 +0000 @@ -299,6 +299,9 @@ MS-DOS doesn't support asynchronous subprocesses, so this option doesn't work there. +@item @code{(:file @var{file-name})} +Send the output to the file name specified. + @item @code{(@var{real-destination} @var{error-destination})} Keep the standard output stream separate from the standard error stream; deal with the ordinary output as specified by @var{real-destination}, === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-30 10:31:17 +0000 +++ src/ChangeLog 2011-05-01 00:04:17 +0000 @@ -1,3 +1,13 @@ +2011-05-01 Lars Magne Ingebrigtsen + + * sysdep.c (interruptible_wait_for_termination): New function + which is like wait_for_termination, but allows keyboard + interruptions. + + * callproc.c (Fcall_process): Add (:file "file") as an option for + the STDOUT buffer. + (Fcall_process_region): Ditto. + 2011-04-30 Eli Zaretskii * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)' === modified file 'src/callproc.c' --- src/callproc.c 2011-04-14 19:34:42 +0000 +++ src/callproc.c 2011-05-01 00:04:17 +0000 @@ -156,8 +156,9 @@ doc: /* Call PROGRAM synchronously in separate process. The remaining arguments are optional. The program's input comes from file INFILE (nil means `/dev/null'). -Insert output in BUFFER before point; t means current buffer; - nil for BUFFER means discard it; 0 means discard and don't wait. +Insert output in BUFFER before point; t means current buffer; nil for BUFFER + means discard it; 0 means discard and don't wait; and `(:file FILE)', where + FILE is a file name string, means that it should be written to that file. BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, REAL-BUFFER says what to do with standard output, as above, while STDERR-FILE says what to do with standard error in the child. @@ -196,14 +197,17 @@ /* File to use for stderr in the child. t means use same as standard output. */ Lisp_Object error_file; + Lisp_Object output_file = Qnil; #ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */ char *outf, *tempfile; int outfilefd; #endif + int fd_output = -1; struct coding_system process_coding; /* coding-system of process output */ struct coding_system argument_coding; /* coding-system of arguments */ /* Set to the return value of Ffind_operation_coding_system. */ Lisp_Object coding_systems; + int output_to_buffer = 1; /* Qt denotes that Ffind_operation_coding_system is not yet called. */ coding_systems = Qt; @@ -273,9 +277,12 @@ { buffer = args[2]; - /* If BUFFER is a list, its meaning is - (BUFFER-FOR-STDOUT FILE-FOR-STDERR). */ - if (CONSP (buffer)) + /* If BUFFER is a list, its meaning is (BUFFER-FOR-STDOUT + FILE-FOR-STDERR), unless the first element is :file, in which case see + the next paragraph. */ + if (CONSP (buffer) && + (! SYMBOLP (XCAR (buffer)) || + strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file"))) { if (CONSP (XCDR (buffer))) { @@ -291,6 +298,17 @@ buffer = XCAR (buffer); } + /* If the buffer is (still) a list, it might be a (:file "file") spec. */ + if (CONSP (buffer) && + SYMBOLP (XCAR (buffer)) && + ! strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file")) + { + output_file = Fexpand_file_name (XCAR (XCDR (buffer)), + BVAR (current_buffer, directory)); + CHECK_STRING (output_file); + buffer = Qnil; + } + if (!(EQ (buffer, Qnil) || EQ (buffer, Qt) || INTEGERP (buffer))) @@ -318,11 +336,11 @@ protected by the caller, so all we really have to worry about is buffer. */ { - struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; current_dir = BVAR (current_buffer, directory); - GCPRO4 (infile, buffer, current_dir, error_file); + GCPRO5 (infile, buffer, current_dir, error_file, output_file); current_dir = Funhandled_file_name_directory (current_dir); if (NILP (current_dir)) @@ -342,6 +360,8 @@ current_dir = ENCODE_FILE (current_dir); if (STRINGP (error_file) && STRING_MULTIBYTE (error_file)) error_file = ENCODE_FILE (error_file); + if (STRINGP (output_file) && STRING_MULTIBYTE (output_file)) + output_file = ENCODE_FILE (output_file); UNGCPRO; } @@ -353,6 +373,26 @@ infile = DECODE_FILE (infile); report_file_error ("Opening process input file", Fcons (infile, Qnil)); } + + if (STRINGP (output_file)) + { +#ifdef DOS_NT + fd_output = emacs_open (SSDATA (output_file), + O_WRONLY | O_TRUNC | O_CREAT | O_TEXT, + S_IREAD | S_IWRITE); +#else /* not DOS_NT */ + fd_output = creat (SSDATA (output_file), 0666); +#endif /* not DOS_NT */ + if (fd_output < 0) + { + output_file = DECODE_FILE (output_file); + report_file_error ("Opening process output file", + Fcons (output_file, Qnil)); + } + if (STRINGP (error_file) || NILP (error_file)) + output_to_buffer = 0; + } + /* Search for program; barf if not found. */ { struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; @@ -413,13 +453,18 @@ strcat (tempfile, "detmp.XXX"); mktemp (tempfile); - outfilefd = creat (tempfile, S_IREAD | S_IWRITE); - if (outfilefd < 0) + /* If we're redirecting STDOUT to a file, this is already opened. */ + if (fd_output < 0) { - emacs_close (filefd); - report_file_error ("Opening process output file", - Fcons (build_string (tempfile), Qnil)); + outfilefd = creat (tempfile, S_IREAD | S_IWRITE); + if (outfilefd < 0) { + emacs_close (filefd); + report_file_error ("Opening process output file", + Fcons (build_string (tempfile), Qnil)); + } } + else + outfilefd = fd_output; fd[0] = filefd; fd[1] = outfilefd; #endif /* MSDOS */ @@ -450,6 +495,8 @@ struct sigaction sigpipe_action; #endif + if (fd_output >= 0) + fd1 = fd_output; #if 0 /* Some systems don't have sigblock. */ mask = sigblock (sigmask (SIGCHLD)); #endif @@ -591,6 +638,8 @@ /* Close most of our fd's, but not fd[0] since we will use that to read input from. */ emacs_close (filefd); + if (fd_output >= 0) + emacs_close (fd_output); if (fd1 >= 0 && fd1 != fd_error) emacs_close (fd1); } @@ -673,6 +722,7 @@ immediate_quit = 1; QUIT; + if (output_to_buffer) { register EMACS_INT nread; int first = 1; @@ -802,7 +852,10 @@ #ifndef MSDOS /* Wait for it to terminate, unless it already has. */ - wait_for_termination (pid); + if (output_to_buffer) + wait_for_termination (pid); + else + interruptible_wait_for_termination (pid); #endif immediate_quit = 0; @@ -850,8 +903,10 @@ The remaining arguments are optional. Delete the text if fourth arg DELETE is non-nil. -Insert output in BUFFER before point; t means current buffer; - nil for BUFFER means discard it; 0 means discard and don't wait. +Insert output in BUFFER before point; t means current buffer; nil for + BUFFER means discard it; 0 means discard and don't wait; and `(:file + FILE)', where FILE is a file name string, means that it should be + written to that file. BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case, REAL-BUFFER says what to do with standard output, as above, while STDERR-FILE says what to do with standard error in the child. === modified file 'src/lisp.h' --- src/lisp.h 2011-04-26 19:14:07 +0000 +++ src/lisp.h 2011-05-01 00:04:17 +0000 @@ -3349,6 +3349,7 @@ extern void init_all_sys_modes (void); extern void reset_all_sys_modes (void); extern void wait_for_termination (int); +extern void interruptible_wait_for_termination (int); extern void flush_pending_output (int); extern void child_setup_tty (int); extern void setup_pty (int); === modified file 'src/sysdep.c' --- src/sysdep.c 2011-04-26 06:17:52 +0000 +++ src/sysdep.c 2011-05-01 00:04:17 +0000 @@ -302,6 +302,19 @@ void wait_for_termination (int pid) { + wait_for_termination_1 (pid, 0); +} + +/* Like the above, but allow keyboard interruption. */ +void +interruptible_wait_for_termination (int pid) +{ + wait_for_termination_1 (pid, 1); +} + +void +wait_for_termination_1 (int pid, int interruptible) +{ while (1) { #if (defined (BSD_SYSTEM) || defined (HPUX)) && !defined(__GNU__) @@ -339,6 +352,8 @@ sigsuspend (&empty_mask); #endif /* not WINDOWSNT */ #endif /* not BSD_SYSTEM, and not HPUX version >= 6 */ + if (interruptible) + QUIT; } } ------------------------------------------------------------ revno: 104063 committer: Andreas Schwab branch nick: emacs timestamp: Sat 2011-04-30 19:57:07 +0200 message: * lisp/faces.el (face-spec-set-match-display): Don't match toolkit options on terminal frames. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-04-30 15:15:07 +0000 +++ lisp/ChangeLog 2011-04-30 17:57:07 +0000 @@ -1,3 +1,8 @@ +2011-04-30 Andreas Schwab + + * faces.el (face-spec-set-match-display): Don't match toolkit + options on terminal frames. + 2011-04-29 Stefan Monnier * progmodes/pascal.el: Use lexical binding. === modified file 'lisp/faces.el' --- lisp/faces.el 2011-04-19 13:44:55 +0000 +++ lisp/faces.el 2011-04-30 17:57:07 +0000 @@ -1451,18 +1451,18 @@ ;; of supported colors, and all defface's ;; are changed to look at number of colors ;; instead of (type graphic) etc. - (and (null (window-system frame)) - (memq 'tty options)) - (and (memq 'motif options) - (featurep 'motif)) - (and (memq 'gtk options) - (featurep 'gtk)) - (and (memq 'lucid options) - (featurep 'x-toolkit) - (not (featurep 'motif)) - (not (featurep 'gtk))) - (and (memq 'x-toolkit options) - (featurep 'x-toolkit)))) + (if (null (window-system frame)) + (memq 'tty options) + (or (and (memq 'motif options) + (featurep 'motif)) + (and (memq 'gtk options) + (featurep 'gtk)) + (and (memq 'lucid options) + (featurep 'x-toolkit) + (not (featurep 'motif)) + (not (featurep 'gtk))) + (and (memq 'x-toolkit options) + (featurep 'x-toolkit)))))) ((eq req 'min-colors) (>= (display-color-cells frame) (car options))) ((eq req 'class) ------------------------------------------------------------ revno: 104062 committer: Vinicius Jose Latorre + + * whitespace.el: New version 13.2.1. + +2011-04-20 felix (tiny change) + + * whitespace.el (global-whitespace-mode): keep highlight when + switching between major modes on a file. + 2011-04-19 Stefan Monnier * progmodes/octave-mod.el (octave-in-comment-p, octave-in-string-p) === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2011-04-19 13:44:55 +0000 +++ lisp/whitespace.el 2011-04-30 15:15:07 +0000 @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre ;; Keywords: data, wp -;; Version: 13.2 +;; Version: 13.2.1 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; This file is part of GNU Emacs. @@ -312,6 +312,9 @@ ;; Acknowledgements ;; ---------------- ;; +;; Thanks to felix (EmacsWiki) for keeping highlight when switching between +;; major modes on a file. +;; ;; Thanks to David Reitter for suggesting a ;; `whitespace-newline' initialization with low contrast relative to ;; the background color. @@ -1132,6 +1135,7 @@ (global-whitespace-mode ; global-whitespace-mode on (save-excursion (add-hook 'find-file-hook 'whitespace-turn-on-if-enabled) + (add-hook 'after-change-major-mode-hook 'whitespace-turn-on-if-enabled) (dolist (buffer (buffer-list)) ; adjust all local mode (set-buffer buffer) (unless whitespace-mode @@ -1139,6 +1143,7 @@ (t ; global-whitespace-mode off (save-excursion (remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled) + (remove-hook 'after-change-major-mode-hook 'whitespace-turn-on-if-enabled) (dolist (buffer (buffer-list)) ; adjust all local mode (set-buffer buffer) (unless whitespace-mode ------------------------------------------------------------ revno: 104061 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-04-30 13:35:16 +0300 message: Adapt the MSDOS build to changes in revno 104021. msdos/inttypes.h: New file. msdos/sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX) (HAVE_STRTOULL, HAVE_STRTOULL): Define to 1. msdos/sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h. msdos/sed1v2.inp (CPPFLAGS): Edit to "-I../msdos". Add ../msdos/inttypes.h to prerequisites of lread.o. src/dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)' rather than `XVECTOR (FOO)->size'. diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2011-04-24 12:48:30 +0000 +++ msdos/ChangeLog 2011-04-30 10:31:17 +0000 @@ -1,3 +1,15 @@ +2011-04-30 Eli Zaretskii + + * inttypes.h: New file. + + * sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX) + (HAVE_STRTOULL, HAVE_STRTOULL): Define to 1. + + * sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h. + + * sed1v2.inp (CPPFLAGS): Edit to "-I../msdos". + Add ../msdos/inttypes.h to prerequisites of lread.o. + 2011-04-24 Eli Zaretskii * sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out === added file 'msdos/inttypes.h' --- msdos/inttypes.h 1970-01-01 00:00:00 +0000 +++ msdos/inttypes.h 2011-04-30 10:31:17 +0000 @@ -0,0 +1,31 @@ +/* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP. + +Copyright (C) 2011 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . */ + +#ifndef _REPL_INTTYPES_H +#define _REPL_INTTYPES_H + +#if __DJGPP__ > 2 || __DJGPP_MINOR__ >= 4 +#include_next +#else /* __DJGPP__ < 2.04 */ +#include +#define uintmax_t unsigned long long +#define strtoumax strtoull +#endif /* __DJGPP__ < 2.04 */ + +#endif === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2011-02-19 19:49:10 +0000 +++ msdos/sed1v2.inp 2011-04-30 10:31:17 +0000 @@ -28,7 +28,8 @@ /^CPP *=/s/@[^@\n]*@/gcc -e/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/ /^ALL_CFLAGS *=/s/@[^@\n]*@//g -/^CPPFLAGS *=/s/@[^@\n]*@// +/^ALL_CFLAGS *=/s/ -I\.//g +/^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos| /^LDFLAGS *=/s/@[^@\n]*@// /^LD_FIRSTFLAG *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// @@ -193,3 +194,5 @@ s/ \$(C_SWITCH_X_SITE)// s/ \$(DBUS_CFLAGS)// s| -I\$(srcdir)/../lib|| +# Add our local inttypes.h to prerequisites where needed +/^lread\.o:/s|lread\.c|& ../msdos/inttypes.h| === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2011-02-26 12:55:10 +0000 +++ msdos/sed2v2.inp 2011-04-30 10:31:17 +0000 @@ -100,6 +100,10 @@ #else\ #undef HAVE_STDINT_H\ #endif +s/^#undef HAVE_DECL_STRTOULL *$/#define HAVE_DECL_STRTOULL 1/ +s/^#undef HAVE_DECL_STRTOUMAX *$/#define HAVE_DECL_STRTOUMAX 1/ +s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ +s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ # Comment out any remaining undef directives, because some of them # might be defined in sys/config.h we include at the top of config.h. === modified file 'msdos/sedlibmk.inp' --- msdos/sedlibmk.inp 2011-04-24 12:48:30 +0000 +++ msdos/sedlibmk.inp 2011-04-30 10:31:17 +0000 @@ -515,8 +515,9 @@ /^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/ /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// /^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o/ -/^am_libgnu_a_OBJECTS *=/s/careadlinkat.\$(OBJEXT)// -/^am_libgnu_a_OBJECTS *=/s/allocator.\$(OBJEXT)// +/^BUILT_SOURCES *=/s/ *inttypes\.h// +/^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)// +/^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)// /^srcdir *=/s/@[^@\n]*@/./ /^top_srcdir *=/s/@[^@\n]*@/../ /^top_builddir *=/s/@[^@\n]*@/../ === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-30 09:31:01 +0000 +++ src/ChangeLog 2011-04-30 10:31:17 +0000 @@ -1,5 +1,8 @@ 2011-04-30 Eli Zaretskii + * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)' + rather than `XVECTOR (FOO)->size'. + * process.c: Remove HAVE_INTTYPES_H condition from inclusion of inttypes.h, as a gnulib replacement is used if it not available in system headers. === modified file 'src/dosfns.c' --- src/dosfns.c 2011-01-25 04:08:28 +0000 +++ src/dosfns.c 2011-04-30 10:31:17 +0000 @@ -62,7 +62,7 @@ CHECK_NUMBER (interrupt); no = (unsigned long) XINT (interrupt); CHECK_VECTOR (registers); - if (no < 0 || no > 0xff || XVECTOR (registers)-> size != 8) + if (no < 0 || no > 0xff || ASIZE (registers) != 8) return Qnil; for (i = 0; i < 8; i++) CHECK_NUMBER (XVECTOR (registers)->contents[i]); @@ -102,7 +102,7 @@ CHECK_NUMBER (address); offs = (unsigned long) XINT (address); CHECK_VECTOR (vector); - len = XVECTOR (vector)-> size; + len = ASIZE (vector); if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len) return Qnil; buf = alloca (len); @@ -125,7 +125,7 @@ CHECK_NUMBER (address); offs = (unsigned long) XINT (address); CHECK_VECTOR (vector); - len = XVECTOR (vector)-> size; + len = ASIZE (vector); if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len) return Qnil; buf = alloca (len); ------------------------------------------------------------ revno: 104060 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-04-30 12:31:01 +0300 message: Don't test HAVE_INTTYPES_H in process.c. src/process.c: Remove HAVE_INTTYPES_H condition from inclusion of inttypes.h, as a gnulib replacement is used if it not available in system headers. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-04-29 19:47:29 +0000 +++ src/ChangeLog 2011-04-30 09:31:01 +0000 @@ -1,3 +1,9 @@ +2011-04-30 Eli Zaretskii + + * process.c: Remove HAVE_INTTYPES_H condition from inclusion of + inttypes.h, as a gnulib replacement is used if it not available in + system headers. + 2011-04-21 Eli Zaretskii Lift the MOST_POSITIVE_FIXNUM/4 limitation on visited files. === modified file 'src/process.c' --- src/process.c 2011-04-26 06:17:52 +0000 +++ src/process.c 2011-04-30 09:31:01 +0000 @@ -28,9 +28,7 @@ #include #include #include -#ifdef HAVE_INTTYPES_H #include -#endif #include #include ------------------------------------------------------------ revno: 104059 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-04-30 12:14:30 +0300 message: Define HAVE_LONG_LONG_INT, HAVE_UNSIGNED_LONG_LONG_INT for Windows. nt/config.nt (HAVE_LONG_LONG_INT, HAVE_UNSIGNED_LONG_LONG_INT): Define to 1 for MinGW of MSVC versions >= 1400. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2011-04-28 20:43:23 +0000 +++ nt/ChangeLog 2011-04-30 09:14:30 +0000 @@ -1,3 +1,8 @@ +2011-04-30 Eli Zaretskii + + * config.nt (HAVE_LONG_LONG_INT, HAVE_UNSIGNED_LONG_LONG_INT): + Define to 1 for MinGW of MSVC versions >= 1400. + 2011-04-28 Eli Zaretskii * gmake.defs (ARCH): Fix error message in case of unknown === modified file 'nt/config.nt' --- nt/config.nt 2011-04-27 21:14:34 +0000 +++ nt/config.nt 2011-04-30 09:14:30 +0000 @@ -470,6 +470,16 @@ #define BITS_PER_LONG 32 #endif +#if defined(__MINGW32__) || _MSC_VER >= 1400 + +/* Define to 1 if the system has the type `long long int'. */ +# define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if the system has the type `unsigned long long int'. */ +# define HAVE_UNSIGNED_LONG_LONG_INT 1 + +#endif /* __MINGW32__ || _MSC_VER >= 1400 */ + #ifndef POINTER_TYPE #define POINTER_TYPE void #endif ------------------------------------------------------------ revno: 104058 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2011-04-30 00:03:19 +0000 message: shr.el (shr-strike-through): New face. (shr-tag-s): Use it to provide support. (shr-tag-s): Remove duplicate definition. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-04-25 04:32:07 +0000 +++ lisp/gnus/ChangeLog 2011-04-30 00:03:19 +0000 @@ -1,3 +1,9 @@ +2011-04-29 Lars Magne Ingebrigtsen + + * shr.el (shr-strike-through): New face. + (shr-tag-s): Use it to provide support. + (shr-tag-s): Remove duplicate definition. + 2011-04-25 Teodor Zlatanov * gnus-registry.el (gnus-registry-ignore-group-p): Don't call === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-04-24 22:12:21 +0000 +++ lisp/gnus/shr.el 2011-04-30 00:03:19 +0000 @@ -87,6 +87,10 @@ This is used for cid: URLs, and the function is called with the cid: URL as the argument.") +(defface shr-strike-through '((t (:strike-through t))) + "Font for elements." + :group 'shr) + ;;; Internal variables. (defvar shr-folding-mode nil) @@ -760,6 +764,9 @@ (shr-generic cont) (shr-ensure-newline)) +(defun shr-tag-s (cont) + (shr-fontize-cont cont 'shr-strike-through)) + (defun shr-tag-b (cont) (shr-fontize-cont cont 'bold)) @@ -775,9 +782,6 @@ (defun shr-tag-u (cont) (shr-fontize-cont cont 'underline)) -(defun shr-tag-s (cont) - (shr-fontize-cont cont 'strike-through)) - (defun shr-parse-style (style) (when style (save-match-data ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.