aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2013-03-02 00:04:13 +0100
committerJoakim Verona2013-03-02 00:04:13 +0100
commitc98de16bf81f9a8b9e6296bf0063abda9e95fd68 (patch)
tree16e2ea532fa27a6f80ba6e7a8e4327033c7039fd
parent1fb561e710e892d96da2681824984d2d4f106487 (diff)
parentc9400cdf0e70cc9d14fd7296e3e77d985db56fb9 (diff)
downloademacs-c98de16bf81f9a8b9e6296bf0063abda9e95fd68.tar.gz
emacs-c98de16bf81f9a8b9e6296bf0063abda9e95fd68.zip
auto upstream
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--doc/misc/ChangeLog7
-rw-r--r--doc/misc/tramp.texi36
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/NEWS11
-rw-r--r--lib/putenv.c94
-rw-r--r--lisp/ChangeLog46
-rw-r--r--lisp/ldefs-boot.el392
-rw-r--r--lisp/net/net-utils.el7
-rw-r--r--lisp/net/tramp-adb.el53
-rw-r--r--lisp/net/tramp-sh.el76
-rw-r--r--lisp/net/tramp.el48
-rw-r--r--lisp/textmodes/ispell.el372
-rw-r--r--lisp/textmodes/sgml-mode.el6
-rw-r--r--m4/extern-inline.m45
-rw-r--r--m4/gnulib-comp.m41
-rw-r--r--m4/putenv.m46
17 files changed, 614 insertions, 558 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a2e7769eca..84d9987ccea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
12013-03-01 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2013-02-21 putenv: port better to native Windows
5 2013-02-18 extern-inline: avoid compilation error with HP-UX cc
6 2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv
7
12013-02-28 Ken Brown <kbrown@cornell.edu> 82013-02-28 Ken Brown <kbrown@cornell.edu>
2 9
3 * configure.ac (HAVE_DATA_START): Fix test. (Bug#13818) 10 * configure.ac (HAVE_DATA_START): Fix test. (Bug#13818)
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 48561089dc0..b256bac417f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
12013-03-01 Michael Albinus <michael.albinus@gmx.de>
2
3 * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1"
4 and "plink2" entries. "plink2" is obsolete for a long time.
5 (External methods): Remove "scp1" and "scp2" entries. Explain
6 user name and host name specification for "adb".
7
12013-02-28 Michael Albinus <michael.albinus@gmx.de> 82013-02-28 Michael Albinus <michael.albinus@gmx.de>
2 9
3 * tramp.texi (External methods): Mention `tramp-adb-program'. 10 * tramp.texi (External methods): Mention `tramp-adb-program'.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 1052b030691..84eee0c4319 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -649,13 +649,6 @@ Connect to the remote host with @command{ssh}. This is identical to
649the previous option except that the @command{ssh} package is used, 649the previous option except that the @command{ssh} package is used,
650making the connection more secure. 650making the connection more secure.
651 651
652There are also two variants, @option{ssh1} and @option{ssh2}, that
653call @samp{ssh -1} and @samp{ssh -2}, respectively. This way, you can
654explicitly select whether you want to use the SSH protocol version 1
655or 2 to connect to the remote host. (You can also specify in
656@file{~/.ssh/config}, the SSH configuration file, which protocol
657should be used, and use the regular @option{ssh} method.)
658
659All the methods based on @command{ssh} have an additional feature: you 652All the methods based on @command{ssh} have an additional feature: you
660can specify a host name which looks like @file{host#42} (the real host 653can specify a host name which looks like @file{host#42} (the real host
661name, then a hash sign, then a port number). This means to connect to 654name, then a hash sign, then a port number). This means to connect to
@@ -751,16 +744,6 @@ remote host.
751 744
752This supports the @samp{-P} argument. 745This supports the @samp{-P} argument.
753 746
754Additionally, the methods @option{plink1} and @option{plink2} are
755provided, which call @samp{plink -1 -ssh} or @samp{plink -2 -ssh} in
756order to use SSH protocol version 1 or 2 explicitly.
757
758CCC: Do we have to connect to the remote host once from the command
759line to accept the SSH key? Maybe this can be made automatic?
760
761CCC: Say something about the first shell command failing. This might
762be due to a wrong setting of @code{tramp-rsh-end-of-line}.
763
764 747
765@item @option{plinkx} 748@item @option{plinkx}
766@cindex method plinkx 749@cindex method plinkx
@@ -824,13 +807,6 @@ The cost of the cryptographic handshake at the start of an @command{scp}
824session can begin to absorb the advantage that the lack of encoding and 807session can begin to absorb the advantage that the lack of encoding and
825decoding presents. 808decoding presents.
826 809
827There are also two variants, @option{scp1} and @option{scp2}, that
828call @samp{ssh -1} and @samp{ssh -2}, respectively. This way, you can
829explicitly select whether you want to use the SSH protocol version 1
830or 2 to connect to the remote host. (You can also specify in
831@file{~/.ssh/config}, the SSH configuration file, which protocol
832should be used, and use the regular @option{scp} method.)
833
834All the @command{ssh} based methods support the @samp{-p} feature 810All the @command{ssh} based methods support the @samp{-p} feature
835where you can specify a port number to connect to in the host name. 811where you can specify a port number to connect to in the host name.
836For example, the host name @file{host#42} tells @value{tramp} to 812For example, the host name @file{host#42} tells @value{tramp} to
@@ -1029,6 +1005,18 @@ can be installed as part of the Android SDK. If @command{adb} is not
1029found via the @code{$PATH} environment variable, the variable 1005found via the @code{$PATH} environment variable, the variable
1030@var{tramp-adb-program} must point to its absolute path. 1006@var{tramp-adb-program} must point to its absolute path.
1031 1007
1008Usually, the @command{adb} method does not need any user name. It
1009runs under the permissions of the @command{adbd} process on the
1010Android device. If a user name is specified, @value{tramp} applies an
1011@command{su} on the device. This does not work with all Android
1012devices, especially with nonrooted ones. In that case, an error
1013message is displayed.
1014
1015If there is exactly one Android device connected to the local machine,
1016a host name is not needed. The shortest @value{tramp} name to be used
1017is @file{@trampfn{adb, , ,}} therefore. Otherwise, one could find
1018potential host names with the shell command @command{adb devices}.
1019
1032@end table 1020@end table
1033 1021
1034 1022
diff --git a/etc/ChangeLog b/etc/ChangeLog
index e50d288da1c..a13ab60be36 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
12013-03-01 Michael Albinus <michael.albinus@gmx.de>
2
3 * NEWS: Fix Tramp "adb" entry. Extend list of discontinued Tramp
4 methods.
5
12013-02-25 Paul Eggert <eggert@cs.ucla.edu> 62013-02-25 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Simplify data_start configuration (Bug#13783). 8 Simplify data_start configuration (Bug#13783).
diff --git a/etc/NEWS b/etc/NEWS
index 698757b2305..d937ae70166 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -196,12 +196,13 @@ leave different number of spaces.
196 196
197+++ 197+++
198*** New connection method "adb", which allows to access Android 198*** New connection method "adb", which allows to access Android
199devices by the Android Debug Bridge. The variable `tramp-adb-sdk-dir' 199devices by the Android Debug Bridge. The variable `tramp-adb-program'
200must be set to the Android SDK installation directory. 200can be used to adapt the path of the "adb" program, if needed.
201 201
202*** The connection methods "scpc" and "rsyncc" are discontinued. The 202*** The connection methods "plink1", "ssh1", "ssh2", "scp1", "scp2",
203ssh option "ControlMaster=auto" is set automatically in all ssh-based 203"scpc" and "rsyncc" are discontinued. The ssh option
204methods, when possible. 204"ControlMaster=auto" is set automatically in all ssh-based methods,
205when possible.
205 206
206+++ 207+++
207*** Handlers for `file-acl' and `set-file-acl' for remote machines 208*** Handlers for `file-acl' and `set-file-acl' for remote machines
diff --git a/lib/putenv.c b/lib/putenv.c
index 5f0fedaf9cc..ed666afc3bb 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -34,6 +34,11 @@
34#include <string.h> 34#include <string.h>
35#include <unistd.h> 35#include <unistd.h>
36 36
37#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
38# define WIN32_LEAN_AND_MEAN
39# include <windows.h>
40#endif
41
37#if _LIBC 42#if _LIBC
38# if HAVE_GNU_LD 43# if HAVE_GNU_LD
39# define environ __environ 44# define environ __environ
@@ -67,6 +72,21 @@ _unsetenv (const char *name)
67 72
68 len = strlen (name); 73 len = strlen (name);
69 74
75#if HAVE__PUTENV
76 {
77 int putenv_result, putenv_errno;
78 char *name_ = malloc (len + 2);
79 memcpy (name_, name, len);
80 name_[len] = '=';
81 name_[len + 1] = 0;
82 putenv_result = _putenv (name_);
83 putenv_errno = errno;
84 free (name_);
85 __set_errno (putenv_errno);
86 return putenv_result;
87 }
88#else
89
70 LOCK; 90 LOCK;
71 91
72 ep = environ; 92 ep = environ;
@@ -87,6 +107,7 @@ _unsetenv (const char *name)
87 UNLOCK; 107 UNLOCK;
88 108
89 return 0; 109 return 0;
110#endif
90} 111}
91 112
92 113
@@ -95,9 +116,8 @@ _unsetenv (const char *name)
95int 116int
96putenv (char *string) 117putenv (char *string)
97{ 118{
98 const char *const name_end = strchr (string, '='); 119 const char *name_end = strchr (string, '=');
99 register size_t size; 120 char **ep;
100 register char **ep;
101 121
102 if (name_end == NULL) 122 if (name_end == NULL)
103 { 123 {
@@ -105,30 +125,68 @@ putenv (char *string)
105 return _unsetenv (string); 125 return _unsetenv (string);
106 } 126 }
107 127
108 size = 0; 128#if HAVE__PUTENV
109 for (ep = environ; *ep != NULL; ++ep) 129 /* Rely on _putenv to allocate the new environment. If other
110 if (!strncmp (*ep, string, name_end - string) && 130 parts of the application use _putenv, the !HAVE__PUTENV code
111 (*ep)[name_end - string] == '=') 131 would fight over who owns the environ vector, causing a crash. */
132 if (name_end[1])
133 return _putenv (string);
134 else
135 {
136 /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ")
137 to allocate the environ vector and then replace the new
138 entry with "NAME=". */
139 int putenv_result, putenv_errno;
140 char *name_x = malloc (name_end - string + sizeof "= ");
141 if (!name_x)
142 return -1;
143 memcpy (name_x, string, name_end - string + 1);
144 name_x[name_end - string + 1] = ' ';
145 name_x[name_end - string + 2] = 0;
146 putenv_result = _putenv (name_x);
147 putenv_errno = errno;
148 for (ep = environ; *ep; ep++)
149 if (strcmp (*ep, name_x) == 0)
150 {
151 *ep = string;
152 break;
153 }
154# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
155 if (putenv_result == 0)
156 {
157 /* _putenv propagated "NAME= " into the subprocess environment;
158 fix that by calling SetEnvironmentVariable directly. */
159 name_x[name_end - string] = 0;
160 putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1;
161 putenv_errno = ENOMEM; /* ENOMEM is the only way to fail. */
162 }
163# endif
164 free (name_x);
165 __set_errno (putenv_errno);
166 return putenv_result;
167 }
168#else
169 for (ep = environ; *ep; ep++)
170 if (strncmp (*ep, string, name_end - string) == 0
171 && (*ep)[name_end - string] == '=')
112 break; 172 break;
113 else
114 ++size;
115 173
116 if (*ep == NULL) 174 if (*ep)
175 *ep = string;
176 else
117 { 177 {
118 static char **last_environ = NULL; 178 static char **last_environ = NULL;
119 char **new_environ = (char **) malloc ((size + 2) * sizeof (char *)); 179 size_t size = ep - environ;
120 if (new_environ == NULL) 180 char **new_environ = malloc ((size + 2) * sizeof *new_environ);
181 if (! new_environ)
121 return -1; 182 return -1;
122 (void) memcpy ((void *) new_environ, (void *) environ, 183 new_environ[0] = string;
123 size * sizeof (char *)); 184 memcpy (new_environ + 1, environ, (size + 1) * sizeof *new_environ);
124 new_environ[size] = (char *) string;
125 new_environ[size + 1] = NULL;
126 free (last_environ); 185 free (last_environ);
127 last_environ = new_environ; 186 last_environ = new_environ;
128 environ = new_environ; 187 environ = new_environ;
129 } 188 }
130 else 189#endif
131 *ep = string;
132 190
133 return 0; 191 return 0;
134} 192}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44109a5095f..8b6ffeed01d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
12013-03-01 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-adb.el (tramp-adb-prompt): Extend regexp.
4 (tramp-adb-handle-process-file): Remove superfluous setting.
5 (tramp-adb-command-exit-status): Handle case that COMMAND is nil.
6 (tramp-adb-barf-unless-okay): Use `tramp-adb-command-exit-status'.
7 (tramp-adb-maybe-open-connection): Apply "su" if user is defined.
8
92013-03-01 Stefan Monnier <monnier@iro.umontreal.ca>
10
11 * textmodes/ispell.el: Fix nitpicks and byte-compiler warnings.
12 (ispell-print-if-debug): Build `format' in. Avoid end-of-buffer.
13 (ispell-parse-hunspell-affix-file): Avoid beginning-of-buffer.
14 Use dict-key rather than dict-name for the error message.
15
162013-03-01 Thierry Volpiatto <thierry.volpiatto@gmail.com>
17
18 * net/net-utils.el (net-utils-run-simple): Don't display-buffer
19 when reverting (bug#13831).
20
212013-03-01 Agustín Martín Domingo <agustin.martin@hispalinux.es>
22
23 * textmodes/ispell.el (ispell-find-hunspell-dictionaries):
24 Always expand affix-file before storing to protect against changed
25 `default-directory'.
26 (ispell-print-if-debug): Make sure message is printed at the end
27 of the debug buffer.
28
292013-03-01 Michael Albinus <michael.albinus@gmx.de>
30
31 * net/tramp.el (tramp-obsolete-methods): New defconst.
32 (tramp-warned-obsolete-methods): New defvar.
33 (tramp-find-method): Check for obsolete methods. Map them to a
34 replacement method if appropriate.
35
36 * net/tramp-sh.el (tramp-methods) [scp1, scp2, ssh1, ssh2, plink1]:
37 Remove methods.
38 (top): Remove completion functions for "scp1", "scp2", "ssh1",
39 "ssh2" and "plink1".
40
412013-02-28 Dale Sedivec <dale@codefu.org>
42
43 * textmodes/sgml-mode.el (sgml-syntax-propertize-function):
44 Return valid syntax-table property value when converting
45 quotes within text from string syntax to punctuation syntax (bug#13844).
46
12013-02-28 Juri Linkov <juri@jurta.org> 472013-02-28 Juri Linkov <juri@jurta.org>
2 48
3 * dired-aux.el (dired-diff): If file at point is a backup file, 49 * dired-aux.el (dired-diff): If file at point is a backup file,
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 1c44195cae3..e58967d5a80 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -895,7 +895,7 @@ outline hot-spot navigation (see `allout-mode').
895;;;*** 895;;;***
896 896
897;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" 897;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
898;;;;;; "net/ange-ftp.el" (20743 44982 104196 0)) 898;;;;;; "net/ange-ftp.el" (20763 30266 231060 0))
899;;; Generated autoloads from net/ange-ftp.el 899;;; Generated autoloads from net/ange-ftp.el
900 900
901(defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) 901(defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -1152,8 +1152,8 @@ Returns list of symbols and documentation found.
1152 1152
1153;;;*** 1153;;;***
1154 1154
1155;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20709 1155;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20759
1156;;;;;; 26818 907104 0)) 1156;;;;;; 33211 414988 0))
1157;;; Generated autoloads from arc-mode.el 1157;;; Generated autoloads from arc-mode.el
1158 1158
1159(autoload 'archive-mode "arc-mode" "\ 1159(autoload 'archive-mode "arc-mode" "\
@@ -1245,8 +1245,8 @@ Entering array mode calls the function `array-mode-hook'.
1245 1245
1246;;;*** 1246;;;***
1247 1247
1248;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20709 1248;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20777
1249;;;;;; 26818 907104 0)) 1249;;;;;; 63161 848428 0))
1250;;; Generated autoloads from textmodes/artist.el 1250;;; Generated autoloads from textmodes/artist.el
1251 1251
1252(autoload 'artist-mode "artist" "\ 1252(autoload 'artist-mode "artist" "\
@@ -1480,7 +1480,7 @@ Special commands:
1480;;;*** 1480;;;***
1481 1481
1482;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el" 1482;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el"
1483;;;;;; (20709 26818 907104 0)) 1483;;;;;; (20755 36154 171386 0))
1484;;; Generated autoloads from gnus/auth-source.el 1484;;; Generated autoloads from gnus/auth-source.el
1485 1485
1486(defvar auth-source-cache-expiry 7200 "\ 1486(defvar auth-source-cache-expiry 7200 "\
@@ -1656,7 +1656,7 @@ should be non-nil).
1656 1656
1657;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode 1657;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode
1658;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) 1658;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode)
1659;;;;;; "autorevert" "autorevert.el" (20746 21181 635406 0)) 1659;;;;;; "autorevert" "autorevert.el" (20767 27320 533690 0))
1660;;; Generated autoloads from autorevert.el 1660;;; Generated autoloads from autorevert.el
1661 1661
1662(autoload 'auto-revert-mode "autorevert" "\ 1662(autoload 'auto-revert-mode "autorevert" "\
@@ -2713,7 +2713,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
2713;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile 2713;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile
2714;;;;;; compile-defun byte-compile-file byte-recompile-directory 2714;;;;;; compile-defun byte-compile-file byte-recompile-directory
2715;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) 2715;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning)
2716;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20709 26818 907104 0)) 2716;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20780 39352 990623 0))
2717;;; Generated autoloads from emacs-lisp/bytecomp.el 2717;;; Generated autoloads from emacs-lisp/bytecomp.el
2718(put 'byte-compile-dynamic 'safe-local-variable 'booleanp) 2718(put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
2719(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) 2719(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2872,8 +2872,8 @@ from the cursor position.
2872 2872
2873;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle 2873;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
2874;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc 2874;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
2875;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20721 2875;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20759
2876;;;;;; 17977 14204 0)) 2876;;;;;; 33211 414988 0))
2877;;; Generated autoloads from calc/calc.el 2877;;; Generated autoloads from calc/calc.el
2878 (define-key ctl-x-map "*" 'calc-dispatch) 2878 (define-key ctl-x-map "*" 'calc-dispatch)
2879 2879
@@ -2980,8 +2980,8 @@ See the documentation for `calculator-mode' for more information.
2980 2980
2981;;;*** 2981;;;***
2982 2982
2983;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20725 2983;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20762
2984;;;;;; 15032 264919 0)) 2984;;;;;; 9398 526093 0))
2985;;; Generated autoloads from calendar/calendar.el 2985;;; Generated autoloads from calendar/calendar.el
2986 2986
2987(autoload 'calendar "calendar" "\ 2987(autoload 'calendar "calendar" "\
@@ -3090,7 +3090,7 @@ Obsoletes `c-forward-into-nomenclature'.
3090;;;*** 3090;;;***
3091 3091
3092;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" 3092;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
3093;;;;;; (20739 47925 957834 0)) 3093;;;;;; (20755 36154 171386 0))
3094;;; Generated autoloads from progmodes/cc-engine.el 3094;;; Generated autoloads from progmodes/cc-engine.el
3095 3095
3096(autoload 'c-guess-basic-syntax "cc-engine" "\ 3096(autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -4125,8 +4125,8 @@ For example, the function `case' has an indent property
4125 4125
4126;;;*** 4126;;;***
4127 4127
4128;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20709 26818 4128;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20772 12071
4129;;;;;; 907104 0)) 4129;;;;;; 425443 833000))
4130;;; Generated autoloads from emacs-lisp/cl-lib.el 4130;;; Generated autoloads from emacs-lisp/cl-lib.el
4131 4131
4132(define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3") 4132(define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3")
@@ -4174,8 +4174,8 @@ For use inside Lisp programs, see also `c-macro-expansion'.
4174 4174
4175;;;*** 4175;;;***
4176 4176
4177;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (20709 4177;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (20774
4178;;;;;; 26818 907104 0)) 4178;;;;;; 53405 584723 417000))
4179;;; Generated autoloads from cmuscheme.el 4179;;; Generated autoloads from cmuscheme.el
4180 4180
4181(autoload 'run-scheme "cmuscheme" "\ 4181(autoload 'run-scheme "cmuscheme" "\
@@ -4355,27 +4355,24 @@ on third call it again advances points to the next difference and so on.
4355;;;;;; compilation-shell-minor-mode compilation-mode compilation-start 4355;;;;;; compilation-shell-minor-mode compilation-mode compilation-start
4356;;;;;; compile compilation-disable-input compile-command compilation-search-path 4356;;;;;; compile compilation-disable-input compile-command compilation-search-path
4357;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook 4357;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook
4358;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20723 4358;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20763
4359;;;;;; 59703 12265 0)) 4359;;;;;; 30266 231060 0))
4360;;; Generated autoloads from progmodes/compile.el 4360;;; Generated autoloads from progmodes/compile.el
4361 4361
4362(defvar compilation-mode-hook nil "\ 4362(defvar compilation-mode-hook nil "\
4363List of hook functions run by `compilation-mode' (see `run-mode-hooks').") 4363List of hook functions run by `compilation-mode'.")
4364 4364
4365(custom-autoload 'compilation-mode-hook "compile" t) 4365(custom-autoload 'compilation-mode-hook "compile" t)
4366 4366
4367(defvar compilation-start-hook nil "\ 4367(defvar compilation-start-hook nil "\
4368List of hook functions run by `compilation-start' on the compilation process. 4368Hook run after starting a new compilation process.
4369\(See `run-hook-with-args'). 4369The hook is run with one argument, the new process.")
4370If you use \"omake -P\" and do not want \\[save-buffers-kill-terminal] to ask whether you want
4371the compilation to be killed, you can use this hook:
4372 (add-hook 'compilation-start-hook
4373 (lambda (process) (set-process-query-on-exit-flag process nil)) nil t)")
4374 4370
4375(custom-autoload 'compilation-start-hook "compile" t) 4371(custom-autoload 'compilation-start-hook "compile" t)
4376 4372
4377(defvar compilation-window-height nil "\ 4373(defvar compilation-window-height nil "\
4378Number of lines in a compilation window. If nil, use Emacs default.") 4374Number of lines in a compilation window.
4375If nil, use Emacs default.")
4379 4376
4380(custom-autoload 'compilation-window-height "compile" t) 4377(custom-autoload 'compilation-window-height "compile" t)
4381 4378
@@ -4792,7 +4789,7 @@ If FIX is non-nil, run `copyright-fix-years' instead.
4792;;;*** 4789;;;***
4793 4790
4794;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) 4791;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode)
4795;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20709 26818 907104 4792;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20763 30266 231060
4796;;;;;; 0)) 4793;;;;;; 0))
4797;;; Generated autoloads from progmodes/cperl-mode.el 4794;;; Generated autoloads from progmodes/cperl-mode.el
4798(put 'cperl-indent-level 'safe-local-variable 'integerp) 4795(put 'cperl-indent-level 'safe-local-variable 'integerp)
@@ -4832,7 +4829,7 @@ and POD directives (Disabled by default, see `cperl-electric-keywords'.)
4832 4829
4833The user types the keyword immediately followed by a space, which 4830The user types the keyword immediately followed by a space, which
4834causes the construct to be expanded, and the point is positioned where 4831causes the construct to be expanded, and the point is positioned where
4835she is most likely to want to be. eg. when the user types a space 4832she is most likely to want to be. E.g., when the user types a space
4836following \"if\" the following appears in the buffer: if () { or if () 4833following \"if\" the following appears in the buffer: if () { or if ()
4837} { } and the cursor is between the parentheses. The user can then 4834} { } and the cursor is between the parentheses. The user can then
4838type some boolean expression within the parens. Having done that, 4835type some boolean expression within the parens. Having done that,
@@ -4992,7 +4989,7 @@ Run a `perldoc' on the word around point.
4992;;;*** 4989;;;***
4993 4990
4994;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" 4991;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
4995;;;;;; (20709 26818 907104 0)) 4992;;;;;; (20762 9398 526093 0))
4996;;; Generated autoloads from progmodes/cpp.el 4993;;; Generated autoloads from progmodes/cpp.el
4997 4994
4998(autoload 'cpp-highlight-buffer "cpp" "\ 4995(autoload 'cpp-highlight-buffer "cpp" "\
@@ -5144,7 +5141,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
5144;;;;;; customize-mode customize customize-push-and-save customize-save-variable 5141;;;;;; customize-mode customize customize-push-and-save customize-save-variable
5145;;;;;; customize-set-variable customize-set-value custom-menu-sort-alphabetically 5142;;;;;; customize-set-variable customize-set-value custom-menu-sort-alphabetically
5146;;;;;; custom-buffer-sort-alphabetically custom-browse-sort-alphabetically) 5143;;;;;; custom-buffer-sort-alphabetically custom-browse-sort-alphabetically)
5147;;;;;; "cus-edit" "cus-edit.el" (20709 26818 907104 0)) 5144;;;;;; "cus-edit" "cus-edit.el" (20762 9398 526093 0))
5148;;; Generated autoloads from cus-edit.el 5145;;; Generated autoloads from cus-edit.el
5149 5146
5150(defvar custom-browse-sort-alphabetically nil "\ 5147(defvar custom-browse-sort-alphabetically nil "\
@@ -5647,8 +5644,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message.
5647 5644
5648;;;*** 5645;;;***
5649 5646
5650;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20709 5647;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20763
5651;;;;;; 26818 907104 0)) 5648;;;;;; 30266 231060 0))
5652;;; Generated autoloads from progmodes/dcl-mode.el 5649;;; Generated autoloads from progmodes/dcl-mode.el
5653 5650
5654(autoload 'dcl-mode "dcl-mode" "\ 5651(autoload 'dcl-mode "dcl-mode" "\
@@ -5971,7 +5968,7 @@ the first time the mode is used.
5971;;;*** 5968;;;***
5972 5969
5973;;;### (autoloads (describe-char describe-text-properties) "descr-text" 5970;;;### (autoloads (describe-char describe-text-properties) "descr-text"
5974;;;;;; "descr-text.el" (20709 26818 907104 0)) 5971;;;;;; "descr-text.el" (20764 51137 83502 0))
5975;;; Generated autoloads from descr-text.el 5972;;; Generated autoloads from descr-text.el
5976 5973
5977(autoload 'describe-text-properties "descr-text" "\ 5974(autoload 'describe-text-properties "descr-text" "\
@@ -6274,7 +6271,7 @@ Major mode for editing the diary file.
6274 6271
6275;;;### (autoloads (diff-buffer-with-file diff-latest-backup-file 6272;;;### (autoloads (diff-buffer-with-file diff-latest-backup-file
6276;;;;;; diff-backup diff diff-command diff-switches) "diff" "vc/diff.el" 6273;;;;;; diff-backup diff diff-command diff-switches) "diff" "vc/diff.el"
6277;;;;;; (20721 17977 14204 0)) 6274;;;;;; (20760 54070 584283 0))
6278;;; Generated autoloads from vc/diff.el 6275;;; Generated autoloads from vc/diff.el
6279 6276
6280(defvar diff-switches (purecopy "-c") "\ 6277(defvar diff-switches (purecopy "-c") "\
@@ -6323,7 +6320,7 @@ This requires the external program `diff' to be in your `exec-path'.
6323;;;*** 6320;;;***
6324 6321
6325;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" 6322;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el"
6326;;;;;; (20709 26818 907104 0)) 6323;;;;;; (20784 36406 653593 0))
6327;;; Generated autoloads from vc/diff-mode.el 6324;;; Generated autoloads from vc/diff-mode.el
6328 6325
6329(autoload 'diff-mode "diff-mode" "\ 6326(autoload 'diff-mode "diff-mode" "\
@@ -6366,9 +6363,9 @@ Optional arguments are passed to `dig-invoke'.
6366 6363
6367;;;*** 6364;;;***
6368 6365
6369;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window 6366;;;### (autoloads (dired-hide-details-mode dired-mode dired-noselect
6370;;;;;; dired dired-listing-switches) "dired" "dired.el" (20731 53823 6367;;;;;; dired-other-frame dired-other-window dired dired-listing-switches)
6371;;;;;; 676680 0)) 6368;;;;;; "dired" "dired.el" (20784 36406 653593 0))
6372;;; Generated autoloads from dired.el 6369;;; Generated autoloads from dired.el
6373 6370
6374(defvar dired-listing-switches (purecopy "-al") "\ 6371(defvar dired-listing-switches (purecopy "-al") "\
@@ -6486,6 +6483,11 @@ Keybindings:
6486\(fn &optional DIRNAME SWITCHES)" nil nil) 6483\(fn &optional DIRNAME SWITCHES)" nil nil)
6487 (put 'dired-find-alternate-file 'disabled t) 6484 (put 'dired-find-alternate-file 'disabled t)
6488 6485
6486(autoload 'dired-hide-details-mode "dired" "\
6487Hide details in `dired-mode'.
6488
6489\(fn &optional ARG)" t nil)
6490
6489;;;*** 6491;;;***
6490 6492
6491;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el" 6493;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el"
@@ -6723,8 +6725,8 @@ Locate SOA record and increment the serial field.
6723;;;*** 6725;;;***
6724 6726
6725;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe 6727;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe
6726;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20737 6728;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20783
6727;;;;;; 6202 609148 0)) 6729;;;;;; 15545 430927 0))
6728;;; Generated autoloads from doc-view.el 6730;;; Generated autoloads from doc-view.el
6729 6731
6730(autoload 'doc-view-mode-p "doc-view" "\ 6732(autoload 'doc-view-mode-p "doc-view" "\
@@ -6811,7 +6813,7 @@ Switch to *dungeon* buffer and start game.
6811 6813
6812;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap 6814;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
6813;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode" 6815;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode"
6814;;;;;; "emacs-lisp/easy-mmode.el" (20709 26818 907104 0)) 6816;;;;;; "emacs-lisp/easy-mmode.el" (20780 39352 990623 0))
6815;;; Generated autoloads from emacs-lisp/easy-mmode.el 6817;;; Generated autoloads from emacs-lisp/easy-mmode.el
6816 6818
6817(defalias 'easy-mmode-define-minor-mode 'define-minor-mode) 6819(defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -6865,13 +6867,14 @@ BODY contains code to execute each time the mode is enabled or disabled.
6865:require SYM Same as in `defcustom'. 6867:require SYM Same as in `defcustom'.
6866:variable PLACE The location to use instead of the variable MODE to store 6868:variable PLACE The location to use instead of the variable MODE to store
6867 the state of the mode. This can be simply a different 6869 the state of the mode. This can be simply a different
6868 named variable, or more generally anything that can be used 6870 named variable, or a generalized variable.
6869 with the CL macro `setf'. PLACE can also be of the form 6871 PLACE can also be of the form (GET . SET), where GET is
6870 (GET . SET), where GET is an expression that returns the 6872 an expression that returns the current state, and SET is
6871 current state, and SET is a function that takes one argument, 6873 a function that takes one argument, the new state, and
6872 the new state, and sets it. If you specify a :variable, 6874 sets it. If you specify a :variable, this function does
6873 this function does not define a MODE variable (nor any of 6875 not define a MODE variable (nor any of the terms used
6874 the terms used in :variable). 6876 in :variable).
6877
6875:after-hook A single lisp form which is evaluated after the mode hooks 6878:after-hook A single lisp form which is evaluated after the mode hooks
6876 have been run. It should not be quoted. 6879 have been run. It should not be quoted.
6877 6880
@@ -6907,6 +6910,10 @@ correctly with the current major mode. This is important to
6907prevent problems with derived modes, that is, major modes that 6910prevent problems with derived modes, that is, major modes that
6908call another major mode in their body. 6911call another major mode in their body.
6909 6912
6913When a major mode is initialized, MODE is actually turned on just
6914after running the major mode's hook. However, MODE is not turned
6915on if the hook has explicitly disabled it.
6916
6910\(fn GLOBAL-MODE MODE TURN-ON &rest KEYS)" nil t) 6917\(fn GLOBAL-MODE MODE TURN-ON &rest KEYS)" nil t)
6911 6918
6912(put 'define-globalized-minor-mode 'doc-string-elt '2) 6919(put 'define-globalized-minor-mode 'doc-string-elt '2)
@@ -7571,8 +7578,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
7571 7578
7572;;;*** 7579;;;***
7573 7580
7574;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20709 26818 7581;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20748 62911
7575;;;;;; 907104 0)) 7582;;;;;; 684442 0))
7576;;; Generated autoloads from cedet/ede.el 7583;;; Generated autoloads from cedet/ede.el
7577 7584
7578(defvar global-ede-mode nil "\ 7585(defvar global-ede-mode nil "\
@@ -7929,7 +7936,7 @@ Display Ediff's registry.
7929;;;*** 7936;;;***
7930 7937
7931;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) 7938;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
7932;;;;;; "ediff-util" "vc/ediff-util.el" (20709 26818 907104 0)) 7939;;;;;; "ediff-util" "vc/ediff-util.el" (20777 63161 848428 0))
7933;;; Generated autoloads from vc/ediff-util.el 7940;;; Generated autoloads from vc/ediff-util.el
7934 7941
7935(autoload 'ediff-toggle-multiframe "ediff-util" "\ 7942(autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -8017,7 +8024,7 @@ Turn on EDT Emulation.
8017;;;*** 8024;;;***
8018 8025
8019;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el" 8026;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el"
8020;;;;;; (20709 26818 907104 0)) 8027;;;;;; (20762 9398 526093 0))
8021;;; Generated autoloads from ehelp.el 8028;;; Generated autoloads from ehelp.el
8022 8029
8023(autoload 'with-electric-help "ehelp" "\ 8030(autoload 'with-electric-help "ehelp" "\
@@ -8054,7 +8061,7 @@ BUFFER is put back into its original major mode.
8054;;;*** 8061;;;***
8055 8062
8056;;;### (autoloads (customize-object) "eieio-custom" "emacs-lisp/eieio-custom.el" 8063;;;### (autoloads (customize-object) "eieio-custom" "emacs-lisp/eieio-custom.el"
8057;;;;;; (20709 26818 907104 0)) 8064;;;;;; (20771 24374 643644 0))
8058;;; Generated autoloads from emacs-lisp/eieio-custom.el 8065;;; Generated autoloads from emacs-lisp/eieio-custom.el
8059 8066
8060(autoload 'customize-object "eieio-custom" "\ 8067(autoload 'customize-object "eieio-custom" "\
@@ -8067,7 +8074,7 @@ Optional argument GROUP is the sub-group of slots to display.
8067 8074
8068;;;### (autoloads (eieio-describe-generic eieio-describe-constructor 8075;;;### (autoloads (eieio-describe-generic eieio-describe-constructor
8069;;;;;; eieio-describe-class eieio-browse) "eieio-opt" "emacs-lisp/eieio-opt.el" 8076;;;;;; eieio-describe-class eieio-browse) "eieio-opt" "emacs-lisp/eieio-opt.el"
8070;;;;;; (20709 26818 907104 0)) 8077;;;;;; (20771 24374 643644 0))
8071;;; Generated autoloads from emacs-lisp/eieio-opt.el 8078;;; Generated autoloads from emacs-lisp/eieio-opt.el
8072 8079
8073(autoload 'eieio-browse "eieio-opt" "\ 8080(autoload 'eieio-browse "eieio-opt" "\
@@ -8101,7 +8108,7 @@ Also extracts information about all methods specific to this generic.
8101;;;*** 8108;;;***
8102 8109
8103;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) 8110;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string)
8104;;;;;; "eldoc" "emacs-lisp/eldoc.el" (20709 26818 907104 0)) 8111;;;;;; "eldoc" "emacs-lisp/eldoc.el" (20770 3512 176098 0))
8105;;; Generated autoloads from emacs-lisp/eldoc.el 8112;;; Generated autoloads from emacs-lisp/eldoc.el
8106 8113
8107(defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ 8114(defvar eldoc-minor-mode-string (purecopy " ElDoc") "\
@@ -8336,7 +8343,7 @@ Other values are interpreted as usual.
8336;;;*** 8343;;;***
8337 8344
8338;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" 8345;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
8339;;;;;; (20709 26818 907104 0)) 8346;;;;;; (20759 33211 414988 0))
8340;;; Generated autoloads from mail/emacsbug.el 8347;;; Generated autoloads from mail/emacsbug.el
8341 8348
8342(autoload 'report-emacs-bug "emacsbug" "\ 8349(autoload 'report-emacs-bug "emacsbug" "\
@@ -8452,8 +8459,8 @@ Commands:
8452;;;;;; epa-sign-region epa-verify-cleartext-in-region epa-verify-region 8459;;;;;; epa-sign-region epa-verify-cleartext-in-region epa-verify-region
8453;;;;;; epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file 8460;;;;;; epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file
8454;;;;;; epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys 8461;;;;;; epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys
8455;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20709 8462;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20762
8456;;;;;; 26818 907104 0)) 8463;;;;;; 9398 526093 0))
8457;;; Generated autoloads from epa.el 8464;;; Generated autoloads from epa.el
8458 8465
8459(autoload 'epa-list-keys "epa" "\ 8466(autoload 'epa-list-keys "epa" "\
@@ -8860,7 +8867,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
8860;;;*** 8867;;;***
8861 8868
8862;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) 8869;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
8863;;;;;; "erc-dcc" "erc/erc-dcc.el" (20719 62656 824443 0)) 8870;;;;;; "erc-dcc" "erc/erc-dcc.el" (20759 33211 414988 0))
8864;;; Generated autoloads from erc/erc-dcc.el 8871;;; Generated autoloads from erc/erc-dcc.el
8865 (autoload 'erc-dcc-mode "erc-dcc") 8872 (autoload 'erc-dcc-mode "erc-dcc")
8866 8873
@@ -9055,7 +9062,7 @@ You can save every individual message by putting this function on
9055;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host 9062;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host
9056;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool 9063;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool
9057;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" 9064;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el"
9058;;;;;; (20709 26818 907104 0)) 9065;;;;;; (20763 30266 231060 0))
9059;;; Generated autoloads from erc/erc-match.el 9066;;; Generated autoloads from erc/erc-match.el
9060 (autoload 'erc-match-mode "erc-match") 9067 (autoload 'erc-match-mode "erc-match")
9061 9068
@@ -9298,7 +9305,7 @@ Add a file to `erc-xdcc-files'.
9298 9305
9299;;;### (autoloads (ert-describe-test ert-run-tests-interactively 9306;;;### (autoloads (ert-describe-test ert-run-tests-interactively
9300;;;;;; ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest) 9307;;;;;; ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest)
9301;;;;;; "ert" "emacs-lisp/ert.el" (20719 62656 824443 0)) 9308;;;;;; "ert" "emacs-lisp/ert.el" (20751 39094 700824 0))
9302;;; Generated autoloads from emacs-lisp/ert.el 9309;;; Generated autoloads from emacs-lisp/ert.el
9303 9310
9304(autoload 'ert-deftest "ert" "\ 9311(autoload 'ert-deftest "ert" "\
@@ -10392,8 +10399,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'.
10392 10399
10393;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue 10400;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
10394;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts 10401;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
10395;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20566 63671 10402;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20759 33211
10396;;;;;; 243798 0)) 10403;;;;;; 414988 0))
10397;;; Generated autoloads from mail/feedmail.el 10404;;; Generated autoloads from mail/feedmail.el
10398 10405
10399(autoload 'feedmail-send-it "feedmail" "\ 10406(autoload 'feedmail-send-it "feedmail" "\
@@ -10448,7 +10455,7 @@ you can set `feedmail-queue-reminder-alist' to nil.
10448 10455
10449;;;### (autoloads (ffap-bindings ffap-guess-file-name-at-point dired-at-point 10456;;;### (autoloads (ffap-bindings ffap-guess-file-name-at-point dired-at-point
10450;;;;;; ffap-at-mouse ffap-menu find-file-at-point ffap-next) "ffap" 10457;;;;;; ffap-at-mouse ffap-menu find-file-at-point ffap-next) "ffap"
10451;;;;;; "ffap.el" (20721 17977 14204 0)) 10458;;;;;; "ffap.el" (20752 26669 524456 0))
10452;;; Generated autoloads from ffap.el 10459;;; Generated autoloads from ffap.el
10453 10460
10454(autoload 'ffap-next "ffap" "\ 10461(autoload 'ffap-next "ffap" "\
@@ -10674,7 +10681,7 @@ result is a string that should be ready for the command line.
10674;;;*** 10681;;;***
10675 10682
10676;;;### (autoloads (find-grep-dired find-name-dired find-dired) "find-dired" 10683;;;### (autoloads (find-grep-dired find-name-dired find-dired) "find-dired"
10677;;;;;; "find-dired.el" (20709 26818 907104 0)) 10684;;;;;; "find-dired.el" (20763 30266 231060 0))
10678;;; Generated autoloads from find-dired.el 10685;;; Generated autoloads from find-dired.el
10679 10686
10680(autoload 'find-dired "find-dired" "\ 10687(autoload 'find-dired "find-dired" "\
@@ -11357,8 +11364,8 @@ with no args, if that value is non-nil.
11357;;;*** 11364;;;***
11358 11365
11359;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region 11366;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region
11360;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (20709 26818 11367;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (20765 36517
11361;;;;;; 907104 0)) 11368;;;;;; 595445 191000))
11362;;; Generated autoloads from play/fortune.el 11369;;; Generated autoloads from play/fortune.el
11363 11370
11364(autoload 'fortune-add-fortune "fortune" "\ 11371(autoload 'fortune-add-fortune "fortune" "\
@@ -11782,7 +11789,7 @@ If CLEAN, obsolete (ignore).
11782;;;*** 11789;;;***
11783 11790
11784;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" 11791;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
11785;;;;;; (20719 62656 824443 0)) 11792;;;;;; (20763 30266 231060 0))
11786;;; Generated autoloads from gnus/gnus-art.el 11793;;; Generated autoloads from gnus/gnus-art.el
11787 11794
11788(autoload 'gnus-article-prepare-display "gnus-art" "\ 11795(autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -12002,7 +12009,7 @@ If gravatars are already displayed, remove them.
12002;;;*** 12009;;;***
12003 12010
12004;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) 12011;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
12005;;;;;; "gnus-group" "gnus/gnus-group.el" (20709 26818 907104 0)) 12012;;;;;; "gnus-group" "gnus/gnus-group.el" (20763 30266 231060 0))
12006;;; Generated autoloads from gnus/gnus-group.el 12013;;; Generated autoloads from gnus/gnus-group.el
12007 12014
12008(autoload 'gnus-fetch-group "gnus-group" "\ 12015(autoload 'gnus-fetch-group "gnus-group" "\
@@ -12317,7 +12324,7 @@ Add NUM into sorted LIST by side effect.
12317;;;*** 12324;;;***
12318 12325
12319;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) 12326;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
12320;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20709 26818 907104 12327;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20779 18487 859617
12321;;;;;; 0)) 12328;;;;;; 0))
12322;;; Generated autoloads from gnus/gnus-registry.el 12329;;; Generated autoloads from gnus/gnus-registry.el
12323 12330
@@ -12374,7 +12381,7 @@ Update the format specification near point.
12374;;;*** 12381;;;***
12375 12382
12376;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" 12383;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el"
12377;;;;;; (20721 17977 14204 0)) 12384;;;;;; (20763 30266 231060 0))
12378;;; Generated autoloads from gnus/gnus-start.el 12385;;; Generated autoloads from gnus/gnus-start.el
12379 12386
12380(autoload 'gnus-declare-backend "gnus-start" "\ 12387(autoload 'gnus-declare-backend "gnus-start" "\
@@ -12385,7 +12392,7 @@ Declare back end NAME with ABILITIES as a Gnus back end.
12385;;;*** 12392;;;***
12386 12393
12387;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" 12394;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el"
12388;;;;;; (20734 30007 218637 0)) 12395;;;;;; (20763 30266 231060 0))
12389;;; Generated autoloads from gnus/gnus-sum.el 12396;;; Generated autoloads from gnus/gnus-sum.el
12390 12397
12391(autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ 12398(autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12468,8 +12475,8 @@ Use \\[describe-mode] for more info.
12468;;;*** 12475;;;***
12469 12476
12470;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address 12477;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address
12471;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (20709 12478;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (20766
12472;;;;;; 26818 907104 0)) 12479;;;;;; 6456 368550 0))
12473;;; Generated autoloads from net/goto-addr.el 12480;;; Generated autoloads from net/goto-addr.el
12474 12481
12475(define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") 12482(define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1")
@@ -12529,8 +12536,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it.
12529 12536
12530;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults 12537;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults
12531;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command 12538;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command
12532;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20709 26818 12539;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20762 9398
12533;;;;;; 907104 0)) 12540;;;;;; 526093 0))
12534;;; Generated autoloads from progmodes/grep.el 12541;;; Generated autoloads from progmodes/grep.el
12535 12542
12536(defvar grep-window-height nil "\ 12543(defvar grep-window-height nil "\
@@ -12563,7 +12570,7 @@ List of hook functions run by `grep-process-setup' (see `run-hooks').")
12563 12570
12564(custom-autoload 'grep-setup-hook "grep" t) 12571(custom-autoload 'grep-setup-hook "grep" t)
12565 12572
12566(defconst grep-regexp-alist '(("^\\(.+?\\)\\(:[ ]*\\)\\([1-9][0-9]*\\)\\2" 1 3 ((lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face 'match))) (when mbeg (- mbeg beg))))) lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face 'match)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg)))))) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\ 12573(defconst grep-regexp-alist '(("^\\(.+?\\)\\(:[ ]*\\)\\([1-9][0-9]*\\)\\2" 1 3 ((lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face))) (when mbeg (- mbeg beg))))) lambda nil (when grep-highlight-matches (let* ((beg (match-end 0)) (end (save-excursion (goto-char beg) (line-end-position))) (mbeg (text-property-any beg end 'font-lock-face grep-match-face)) (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg)))))) ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "\
12567Regexp used to match grep hits. See `compilation-error-regexp-alist'.") 12574Regexp used to match grep hits. See `compilation-error-regexp-alist'.")
12568 12575
12569(defvar grep-program (purecopy "grep") "\ 12576(defvar grep-program (purecopy "grep") "\
@@ -13122,7 +13129,7 @@ different regions. With numeric argument ARG, behaves like
13122;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories 13129;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories
13123;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 13130;;;;;; describe-syntax describe-variable variable-at-point describe-function-1
13124;;;;;; find-lisp-object-file-name help-C-file-name describe-function) 13131;;;;;; find-lisp-object-file-name help-C-file-name describe-function)
13125;;;;;; "help-fns" "help-fns.el" (20709 26818 907104 0)) 13132;;;;;; "help-fns" "help-fns.el" (20764 51137 83502 0))
13126;;; Generated autoloads from help-fns.el 13133;;; Generated autoloads from help-fns.el
13127 13134
13128(autoload 'describe-function "help-fns" "\ 13135(autoload 'describe-function "help-fns" "\
@@ -13335,7 +13342,7 @@ Provide help for current mode.
13335;;;*** 13342;;;***
13336 13343
13337;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" 13344;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl"
13338;;;;;; "hexl.el" (20709 26818 907104 0)) 13345;;;;;; "hexl.el" (20763 30266 231060 0))
13339;;; Generated autoloads from hexl.el 13346;;; Generated autoloads from hexl.el
13340 13347
13341(autoload 'hexl-mode "hexl" "\ 13348(autoload 'hexl-mode "hexl" "\
@@ -13378,8 +13385,8 @@ A sample format:
13378 000000c0: 7265 6769 6f6e 2e0a region.. 13385 000000c0: 7265 6769 6f6e 2e0a region..
13379 13386
13380Movement is as simple as movement in a normal Emacs text buffer. Most 13387Movement is as simple as movement in a normal Emacs text buffer. Most
13381cursor movement bindings are the same (ie. Use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line] 13388cursor movement bindings are the same: use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line]
13382to move the cursor left, right, down, and up). 13389to move the cursor left, right, down, and up.
13383 13390
13384Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are 13391Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are
13385also supported. 13392also supported.
@@ -14070,7 +14077,7 @@ Convert HTML to plain text in the current buffer.
14070;;;*** 14077;;;***
14071 14078
14072;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer) 14079;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer)
14073;;;;;; "htmlfontify" "htmlfontify.el" (20709 26818 907104 0)) 14080;;;;;; "htmlfontify" "htmlfontify.el" (20774 51822 616889 64000))
14074;;; Generated autoloads from htmlfontify.el 14081;;; Generated autoloads from htmlfontify.el
14075 14082
14076(autoload 'htmlfontify-buffer "htmlfontify" "\ 14083(autoload 'htmlfontify-buffer "htmlfontify" "\
@@ -14286,8 +14293,8 @@ buffer `*icalendar-errors*'.
14286 14293
14287;;;*** 14294;;;***
14288 14295
14289;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20710 14296;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20766
14290;;;;;; 47669 981323 0)) 14297;;;;;; 59066 666084 0))
14291;;; Generated autoloads from icomplete.el 14298;;; Generated autoloads from icomplete.el
14292 14299
14293(defvar icomplete-mode nil "\ 14300(defvar icomplete-mode nil "\
@@ -14511,8 +14518,8 @@ The main features of this mode are
14511;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file 14518;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file
14512;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer 14519;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
14513;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window 14520;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
14514;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20709 14521;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20766
14515;;;;;; 26818 907104 0)) 14522;;;;;; 59066 666084 0))
14516;;; Generated autoloads from ido.el 14523;;; Generated autoloads from ido.el
14517 14524
14518(defvar ido-mode nil "\ 14525(defvar ido-mode nil "\
@@ -14804,7 +14811,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
14804;;;;;; create-image image-type-auto-detected-p image-type-available-p 14811;;;;;; create-image image-type-auto-detected-p image-type-available-p
14805;;;;;; image-type image-type-from-file-name image-type-from-file-header 14812;;;;;; image-type image-type-from-file-name image-type-from-file-header
14806;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" 14813;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el"
14807;;;;;; (20709 26818 907104 0)) 14814;;;;;; (20772 45239 494620 0))
14808;;; Generated autoloads from image.el 14815;;; Generated autoloads from image.el
14809 14816
14810(autoload 'image-type-from-data "image" "\ 14817(autoload 'image-type-from-data "image" "\
@@ -15004,7 +15011,7 @@ If Emacs is compiled without ImageMagick support, this does nothing.
15004;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag 15011;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag
15005;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs 15012;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
15006;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) 15013;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs)
15007;;;;;; "image-dired" "image-dired.el" (20709 26818 907104 0)) 15014;;;;;; "image-dired" "image-dired.el" (20768 48184 78670 0))
15008;;; Generated autoloads from image-dired.el 15015;;; Generated autoloads from image-dired.el
15009 15016
15010(autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ 15017(autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\
@@ -15069,7 +15076,7 @@ displayed.
15069 15076
15070(defalias 'image-dired 'image-dired-show-all-from-dir) 15077(defalias 'image-dired 'image-dired-show-all-from-dir)
15071 15078
15072(defalias 'tumme 'image-dired-show-all-from-dir) 15079(define-obsolete-function-alias 'tumme 'image-dired "24.4")
15073 15080
15074(autoload 'image-dired-tag-files "image-dired" "\ 15081(autoload 'image-dired-tag-files "image-dired" "\
15075Tag marked file(s) in dired. With prefix ARG, tag file at point. 15082Tag marked file(s) in dired. With prefix ARG, tag file at point.
@@ -15205,8 +15212,8 @@ An image file is one whose name has an extension in
15205;;;*** 15212;;;***
15206 15213
15207;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode 15214;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode
15208;;;;;; image-mode) "image-mode" "image-mode.el" (20731 53823 676680 15215;;;;;; image-mode) "image-mode" "image-mode.el" (20774 51931 214714
15209;;;;;; 0)) 15216;;;;;; 829000))
15210;;; Generated autoloads from image-mode.el 15217;;; Generated autoloads from image-mode.el
15211 15218
15212(autoload 'image-mode "image-mode" "\ 15219(autoload 'image-mode "image-mode" "\
@@ -15251,7 +15258,7 @@ on these modes.
15251;;;*** 15258;;;***
15252 15259
15253;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar 15260;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar
15254;;;;;; imenu-sort-function) "imenu" "imenu.el" (20747 42040 139863 15261;;;;;; imenu-sort-function) "imenu" "imenu.el" (20784 36406 653593
15255;;;;;; 0)) 15262;;;;;; 0))
15256;;; Generated autoloads from imenu.el 15263;;; Generated autoloads from imenu.el
15257 15264
@@ -15423,7 +15430,7 @@ Convert old Emacs Devanagari characters to UCS.
15423;;;*** 15430;;;***
15424 15431
15425;;;### (autoloads (inferior-lisp) "inf-lisp" "progmodes/inf-lisp.el" 15432;;;### (autoloads (inferior-lisp) "inf-lisp" "progmodes/inf-lisp.el"
15426;;;;;; (20709 26818 907104 0)) 15433;;;;;; (20774 53405 644725 888000))
15427;;; Generated autoloads from progmodes/inf-lisp.el 15434;;; Generated autoloads from progmodes/inf-lisp.el
15428 15435
15429(autoload 'inferior-lisp "inf-lisp" "\ 15436(autoload 'inferior-lisp "inf-lisp" "\
@@ -15445,7 +15452,7 @@ of `inferior-lisp-program'). Runs the hooks from
15445;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node 15452;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node
15446;;;;;; Info-mode info-finder info-apropos Info-index Info-directory 15453;;;;;; Info-mode info-finder info-apropos Info-index Info-directory
15447;;;;;; Info-on-current-buffer info-standalone info-emacs-bug info-emacs-manual 15454;;;;;; Info-on-current-buffer info-standalone info-emacs-bug info-emacs-manual
15448;;;;;; info info-other-window) "info" "info.el" (20721 17977 14204 15455;;;;;; info info-other-window) "info" "info.el" (20774 566 676067
15449;;;;;; 0)) 15456;;;;;; 0))
15450;;; Generated autoloads from info.el 15457;;; Generated autoloads from info.el
15451 15458
@@ -15659,7 +15666,7 @@ Otherwise, visit the manual in a new Info buffer.
15659 15666
15660;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file 15667;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file
15661;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" 15668;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el"
15662;;;;;; (20709 26818 907104 0)) 15669;;;;;; (20771 24374 643644 0))
15663;;; Generated autoloads from info-look.el 15670;;; Generated autoloads from info-look.el
15664 15671
15665(autoload 'info-lookup-reset "info-look" "\ 15672(autoload 'info-lookup-reset "info-look" "\
@@ -15791,8 +15798,7 @@ the sources handy.
15791;;;*** 15798;;;***
15792 15799
15793;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold 15800;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold
15794;;;;;; Info-tagify) "informat" "informat.el" (20709 26818 907104 15801;;;;;; Info-tagify) "informat" "informat.el" (20774 566 676067 0))
15795;;;;;; 0))
15796;;; Generated autoloads from informat.el 15802;;; Generated autoloads from informat.el
15797 15803
15798(autoload 'Info-tagify "informat" "\ 15804(autoload 'Info-tagify "informat" "\
@@ -15991,7 +15997,7 @@ Add submenus to the File menu, to convert to and from various formats.
15991;;;;;; ispell-buffer ispell-comments-and-strings ispell-region ispell-change-dictionary 15997;;;;;; ispell-buffer ispell-comments-and-strings ispell-region ispell-change-dictionary
15992;;;;;; ispell-kill-ispell ispell-help ispell-pdict-save ispell-word 15998;;;;;; ispell-kill-ispell ispell-help ispell-pdict-save ispell-word
15993;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" 15999;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el"
15994;;;;;; (20734 30007 218637 0)) 16000;;;;;; (20784 36406 653593 0))
15995;;; Generated autoloads from textmodes/ispell.el 16001;;; Generated autoloads from textmodes/ispell.el
15996 16002
15997(put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) 16003(put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
@@ -16224,8 +16230,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
16224 16230
16225;;;*** 16231;;;***
16226 16232
16227;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20709 16233;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20766
16228;;;;;; 26818 907104 0)) 16234;;;;;; 59066 666084 0))
16229;;; Generated autoloads from iswitchb.el 16235;;; Generated autoloads from iswitchb.el
16230 16236
16231(defvar iswitchb-mode nil "\ 16237(defvar iswitchb-mode nil "\
@@ -16332,7 +16338,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
16332;;;*** 16338;;;***
16333 16339
16334;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" 16340;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
16335;;;;;; "jka-compr.el" (20709 26818 907104 0)) 16341;;;;;; "jka-compr.el" (20759 33211 414988 0))
16336;;; Generated autoloads from jka-compr.el 16342;;; Generated autoloads from jka-compr.el
16337 16343
16338(defvar jka-compr-inhibit nil "\ 16344(defvar jka-compr-inhibit nil "\
@@ -16355,7 +16361,7 @@ by `jka-compr-installed'.
16355 16361
16356;;;*** 16362;;;***
16357 16363
16358;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20730 32949 736763 16364;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20763 30266 231060
16359;;;;;; 0)) 16365;;;;;; 0))
16360;;; Generated autoloads from progmodes/js.el 16366;;; Generated autoloads from progmodes/js.el
16361 16367
@@ -16839,7 +16845,7 @@ something strange, such as redefining an Emacs function.
16839;;;*** 16845;;;***
16840 16846
16841;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) 16847;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
16842;;;;;; "locate" "locate.el" (20709 26818 907104 0)) 16848;;;;;; "locate" "locate.el" (20763 30266 231060 0))
16843;;; Generated autoloads from locate.el 16849;;; Generated autoloads from locate.el
16844 16850
16845(defvar locate-ls-subdir-switches (purecopy "-al") "\ 16851(defvar locate-ls-subdir-switches (purecopy "-al") "\
@@ -17419,7 +17425,7 @@ The mail client is taken to be the handler of mailto URLs.
17419 17425
17420;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode 17426;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
17421;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) 17427;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode)
17422;;;;;; "make-mode" "progmodes/make-mode.el" (20746 21181 635406 17428;;;;;; "make-mode" "progmodes/make-mode.el" (20748 62911 684442
17423;;;;;; 0)) 17429;;;;;; 0))
17424;;; Generated autoloads from progmodes/make-mode.el 17430;;; Generated autoloads from progmodes/make-mode.el
17425 17431
@@ -17550,7 +17556,7 @@ Previous contents of that buffer are killed first.
17550;;;*** 17556;;;***
17551 17557
17552;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" 17558;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el"
17553;;;;;; (20719 62656 824443 0)) 17559;;;;;; (20762 9398 526093 0))
17554;;; Generated autoloads from man.el 17560;;; Generated autoloads from man.el
17555 17561
17556(defalias 'manual-entry 'man) 17562(defalias 'manual-entry 'man)
@@ -18106,7 +18112,7 @@ to its second argument TM.
18106;;;*** 18112;;;***
18107 18113
18108;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" 18114;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef"
18109;;;;;; "minibuf-eldef.el" (20709 26818 907104 0)) 18115;;;;;; "minibuf-eldef.el" (20760 54070 584283 0))
18110;;; Generated autoloads from minibuf-eldef.el 18116;;; Generated autoloads from minibuf-eldef.el
18111 18117
18112(defvar minibuffer-electric-default-mode nil "\ 18118(defvar minibuffer-electric-default-mode nil "\
@@ -18383,7 +18389,7 @@ body) or \"attachment\" (separate from the body).
18383 18389
18384;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt 18390;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt
18385;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) 18391;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt)
18386;;;;;; "mml2015" "gnus/mml2015.el" (20709 26818 907104 0)) 18392;;;;;; "mml2015" "gnus/mml2015.el" (20780 39352 990623 0))
18387;;; Generated autoloads from gnus/mml2015.el 18393;;; Generated autoloads from gnus/mml2015.el
18388 18394
18389(autoload 'mml2015-decrypt "mml2015" "\ 18395(autoload 'mml2015-decrypt "mml2015" "\
@@ -18938,8 +18944,8 @@ of the piece of advice.
18938;;;### (autoloads (network-connection network-connection-to-service 18944;;;### (autoloads (network-connection network-connection-to-service
18939;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host 18945;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host
18940;;;;;; nslookup nslookup-host ping traceroute route arp netstat 18946;;;;;; nslookup nslookup-host ping traceroute route arp netstat
18941;;;;;; iwconfig ifconfig) "net-utils" "net/net-utils.el" (20709 18947;;;;;; iwconfig ifconfig) "net-utils" "net/net-utils.el" (20784
18942;;;;;; 26818 907104 0)) 18948;;;;;; 36406 653593 0))
18943;;; Generated autoloads from net/net-utils.el 18949;;; Generated autoloads from net/net-utils.el
18944 18950
18945(autoload 'ifconfig "net-utils" "\ 18951(autoload 'ifconfig "net-utils" "\
@@ -19047,7 +19053,7 @@ listed in the PORTS list.
19047;;;*** 19053;;;***
19048 19054
19049;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el" 19055;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el"
19050;;;;;; (20709 26818 907104 0)) 19056;;;;;; (20770 3512 176098 0))
19051;;; Generated autoloads from net/network-stream.el 19057;;; Generated autoloads from net/network-stream.el
19052 19058
19053(autoload 'open-network-stream "network-stream" "\ 19059(autoload 'open-network-stream "network-stream" "\
@@ -19160,7 +19166,7 @@ Run `newsticker-start-hook' if newsticker was not running already.
19160;;;*** 19166;;;***
19161 19167
19162;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el" 19168;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el"
19163;;;;;; (20709 26818 907104 0)) 19169;;;;;; (20762 9398 526093 0))
19164;;; Generated autoloads from net/newst-plainview.el 19170;;; Generated autoloads from net/newst-plainview.el
19165 19171
19166(autoload 'newsticker-plainview "newst-plainview" "\ 19172(autoload 'newsticker-plainview "newst-plainview" "\
@@ -19324,8 +19330,8 @@ Return nil if the face cannot display a glyph for N.
19324 19330
19325;;;*** 19331;;;***
19326 19332
19327;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20709 19333;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20763
19328;;;;;; 26818 907104 0)) 19334;;;;;; 30266 231060 0))
19329;;; Generated autoloads from nxml/nxml-mode.el 19335;;; Generated autoloads from nxml/nxml-mode.el
19330 19336
19331(autoload 'nxml-mode "nxml-mode" "\ 19337(autoload 'nxml-mode "nxml-mode" "\
@@ -19559,7 +19565,7 @@ with no args, if that value is non-nil.
19559;;;;;; org-run-like-in-org-mode turn-on-orgstruct++ turn-on-orgstruct 19565;;;;;; org-run-like-in-org-mode turn-on-orgstruct++ turn-on-orgstruct
19560;;;;;; orgstruct-mode org-global-cycle org-cycle org-mode org-clock-persistence-insinuate 19566;;;;;; orgstruct-mode org-global-cycle org-cycle org-mode org-clock-persistence-insinuate
19561;;;;;; turn-on-orgtbl org-version org-babel-do-load-languages) "org" 19567;;;;;; turn-on-orgtbl org-version org-babel-do-load-languages) "org"
19562;;;;;; "org/org.el" (20723 59703 12265 0)) 19568;;;;;; "org/org.el" (20783 15545 430927 0))
19563;;; Generated autoloads from org/org.el 19569;;; Generated autoloads from org/org.el
19564 19570
19565(autoload 'org-babel-do-load-languages "org" "\ 19571(autoload 'org-babel-do-load-languages "org" "\
@@ -19785,7 +19791,7 @@ Call the customize function with org as argument.
19785;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views 19791;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views
19786;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda 19792;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda
19787;;;;;; org-agenda org-toggle-sticky-agenda) "org-agenda" "org/org-agenda.el" 19793;;;;;; org-agenda org-toggle-sticky-agenda) "org-agenda" "org/org-agenda.el"
19788;;;;;; (20723 59703 12265 0)) 19794;;;;;; (20783 15545 430927 0))
19789;;; Generated autoloads from org/org-agenda.el 19795;;; Generated autoloads from org/org-agenda.el
19790 19796
19791(autoload 'org-toggle-sticky-agenda "org-agenda" "\ 19797(autoload 'org-toggle-sticky-agenda "org-agenda" "\
@@ -20034,7 +20040,7 @@ By default `org-agenda-to-appt' will use :deadline, :scheduled
20034and :timestamp entries. See the docstring of `org-diary' for 20040and :timestamp entries. See the docstring of `org-diary' for
20035details and examples. 20041details and examples.
20036 20042
20037If an entry as a APPT_WARNTIME property, its value will be used 20043If an entry has a APPT_WARNTIME property, its value will be used
20038to override `appt-message-warning-time'. 20044to override `appt-message-warning-time'.
20039 20045
20040\(fn &optional REFRESH FILTER &rest ARGS)" t nil) 20046\(fn &optional REFRESH FILTER &rest ARGS)" t nil)
@@ -20162,7 +20168,7 @@ Try very hard to provide sensible version strings.
20162;;;*** 20168;;;***
20163 20169
20164;;;### (autoloads (org-git-version org-release) "org-version" "org/org-version.el" 20170;;;### (autoloads (org-git-version org-release) "org-version" "org/org-version.el"
20165;;;;;; (20723 59703 12265 0)) 20171;;;;;; (20783 15545 430927 0))
20166;;; Generated autoloads from org/org-version.el 20172;;; Generated autoloads from org/org-version.el
20167 20173
20168(autoload 'org-release "org-version" "\ 20174(autoload 'org-release "org-version" "\
@@ -20183,7 +20189,7 @@ The location of ODT styles.")
20183;;;*** 20189;;;***
20184 20190
20185;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" 20191;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
20186;;;;;; (20709 26818 907104 0)) 20192;;;;;; (20773 35190 350513 0))
20187;;; Generated autoloads from outline.el 20193;;; Generated autoloads from outline.el
20188(put 'outline-regexp 'safe-local-variable 'stringp) 20194(put 'outline-regexp 'safe-local-variable 'stringp)
20189(put 'outline-heading-end-regexp 'safe-local-variable 'stringp) 20195(put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
@@ -20247,7 +20253,7 @@ See the command `outline-mode' for more information on this mode.
20247;;;### (autoloads (list-packages describe-package package-initialize 20253;;;### (autoloads (list-packages describe-package package-initialize
20248;;;;;; package-refresh-contents package-install-file package-install-from-buffer 20254;;;;;; package-refresh-contents package-install-file package-install-from-buffer
20249;;;;;; package-install package-enable-at-startup) "package" "emacs-lisp/package.el" 20255;;;;;; package-install package-enable-at-startup) "package" "emacs-lisp/package.el"
20250;;;;;; (20709 26818 907104 0)) 20256;;;;;; (20764 51137 83502 0))
20251;;; Generated autoloads from emacs-lisp/package.el 20257;;; Generated autoloads from emacs-lisp/package.el
20252 20258
20253(defvar package-enable-at-startup t "\ 20259(defvar package-enable-at-startup t "\
@@ -21649,7 +21655,7 @@ Proced buffers.
21649 21655
21650;;;### (autoloads (profiler-find-profile-other-frame profiler-find-profile-other-window 21656;;;### (autoloads (profiler-find-profile-other-frame profiler-find-profile-other-window
21651;;;;;; profiler-find-profile profiler-start) "profiler" "profiler.el" 21657;;;;;; profiler-find-profile profiler-start) "profiler" "profiler.el"
21652;;;;;; (20738 27061 124069 0)) 21658;;;;;; (20752 27211 244736 501000))
21653;;; Generated autoloads from profiler.el 21659;;; Generated autoloads from profiler.el
21654 21660
21655(autoload 'profiler-start "profiler" "\ 21661(autoload 'profiler-start "profiler" "\
@@ -21725,8 +21731,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
21725 21731
21726;;;*** 21732;;;***
21727 21733
21728;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20709 21734;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20777
21729;;;;;; 26818 907104 0)) 21735;;;;;; 63161 848428 0))
21730;;; Generated autoloads from progmodes/ps-mode.el 21736;;; Generated autoloads from progmodes/ps-mode.el
21731 21737
21732(autoload 'ps-mode "ps-mode" "\ 21738(autoload 'ps-mode "ps-mode" "\
@@ -21975,7 +21981,7 @@ If EXTENSION is any other symbol, it is ignored.
21975;;;*** 21981;;;***
21976 21982
21977;;;### (autoloads (python-mode run-python) "python" "progmodes/python.el" 21983;;;### (autoloads (python-mode run-python) "python" "progmodes/python.el"
21978;;;;;; (20746 21181 635406 0)) 21984;;;;;; (20774 51843 230245 0))
21979;;; Generated autoloads from progmodes/python.el 21985;;; Generated autoloads from progmodes/python.el
21980 21986
21981(add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) 21987(add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode))
@@ -22265,8 +22271,8 @@ of each directory.
22265 22271
22266;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls 22272;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls
22267;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url 22273;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url
22268;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20709 22274;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20764
22269;;;;;; 26818 907104 0)) 22275;;;;;; 51137 83502 0))
22270;;; Generated autoloads from net/quickurl.el 22276;;; Generated autoloads from net/quickurl.el
22271 22277
22272(defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ 22278(defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\
@@ -22338,7 +22344,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
22338;;;*** 22344;;;***
22339 22345
22340;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" 22346;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
22341;;;;;; "net/rcirc.el" (20709 26818 907104 0)) 22347;;;;;; "net/rcirc.el" (20770 3512 176098 0))
22342;;; Generated autoloads from net/rcirc.el 22348;;; Generated autoloads from net/rcirc.el
22343 22349
22344(autoload 'rcirc "rcirc" "\ 22350(autoload 'rcirc "rcirc" "\
@@ -22594,8 +22600,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead.
22594;;;*** 22600;;;***
22595 22601
22596;;;### (autoloads (reftex-reset-scanning-information reftex-mode 22602;;;### (autoloads (reftex-reset-scanning-information reftex-mode
22597;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20709 26818 22603;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20777 63161
22598;;;;;; 907104 0)) 22604;;;;;; 848428 0))
22599;;; Generated autoloads from textmodes/reftex.el 22605;;; Generated autoloads from textmodes/reftex.el
22600 22606
22601(autoload 'turn-on-reftex "reftex" "\ 22607(autoload 'turn-on-reftex "reftex" "\
@@ -22779,7 +22785,7 @@ This means the number of non-shy regexp grouping constructs
22779 22785
22780;;;### (autoloads (remember-diary-extract-entries remember-clipboard 22786;;;### (autoloads (remember-diary-extract-entries remember-clipboard
22781;;;;;; remember-other-frame remember) "remember" "textmodes/remember.el" 22787;;;;;; remember-other-frame remember) "remember" "textmodes/remember.el"
22782;;;;;; (20709 26818 907104 0)) 22788;;;;;; (20748 62911 684442 0))
22783;;; Generated autoloads from textmodes/remember.el 22789;;; Generated autoloads from textmodes/remember.el
22784 22790
22785(autoload 'remember "remember" "\ 22791(autoload 'remember "remember" "\
@@ -22798,8 +22804,7 @@ Call `remember' in another frame.
22798 22804
22799(autoload 'remember-clipboard "remember" "\ 22805(autoload 'remember-clipboard "remember" "\
22800Remember the contents of the current clipboard. 22806Remember the contents of the current clipboard.
22801Most useful for remembering things from Netscape or other X Windows 22807Most useful for remembering things from other applications.
22802application.
22803 22808
22804\(fn)" t nil) 22809\(fn)" t nil)
22805 22810
@@ -22994,8 +22999,8 @@ variable.
22994;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers 22999;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
22995;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers 23000;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
22996;;;;;; rmail-user-mail-address-regexp rmail-movemail-variant-p rmail-spool-directory 23001;;;;;; rmail-user-mail-address-regexp rmail-movemail-variant-p rmail-spool-directory
22997;;;;;; rmail-file-name) "rmail" "mail/rmail.el" (20723 59924 854722 23002;;;;;; rmail-file-name) "rmail" "mail/rmail.el" (20762 9398 526093
22998;;;;;; 212000)) 23003;;;;;; 0))
22999;;; Generated autoloads from mail/rmail.el 23004;;; Generated autoloads from mail/rmail.el
23000 23005
23001(defvar rmail-file-name (purecopy "~/RMAIL") "\ 23006(defvar rmail-file-name (purecopy "~/RMAIL") "\
@@ -23446,7 +23451,7 @@ for modes derived from Text mode, like Mail mode.
23446;;;*** 23451;;;***
23447 23452
23448;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el" 23453;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el"
23449;;;;;; (20742 24117 440849 0)) 23454;;;;;; (20764 51137 83502 0))
23450;;; Generated autoloads from progmodes/ruby-mode.el 23455;;; Generated autoloads from progmodes/ruby-mode.el
23451 23456
23452(autoload 'ruby-mode "ruby-mode" "\ 23457(autoload 'ruby-mode "ruby-mode" "\
@@ -23941,7 +23946,7 @@ vertically fixed relative to window boundaries during scrolling.
23941;;;*** 23946;;;***
23942 23947
23943;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic" 23948;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic"
23944;;;;;; "cedet/semantic.el" (20745 310 425822 0)) 23949;;;;;; "cedet/semantic.el" (20748 62911 684442 0))
23945;;; Generated autoloads from cedet/semantic.el 23950;;; Generated autoloads from cedet/semantic.el
23946 23951
23947(defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\ 23952(defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
@@ -24309,8 +24314,8 @@ Like `mail' command, but display mail buffer in another frame.
24309;;;*** 24314;;;***
24310 24315
24311;;;### (autoloads (server-save-buffers-kill-terminal server-mode 24316;;;### (autoloads (server-save-buffers-kill-terminal server-mode
24312;;;;;; server-force-delete server-start) "server" "server.el" (20721 24317;;;;;; server-force-delete server-start) "server" "server.el" (20763
24313;;;;;; 17977 14204 0)) 24318;;;;;; 30266 231060 0))
24314;;; Generated autoloads from server.el 24319;;; Generated autoloads from server.el
24315 24320
24316(put 'server-host 'risky-local-variable t) 24321(put 'server-host 'risky-local-variable t)
@@ -24396,7 +24401,7 @@ These are active only in the minibuffer, when entering or editing a formula:
24396;;;*** 24401;;;***
24397 24402
24398;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" 24403;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el"
24399;;;;;; (20721 17977 14204 0)) 24404;;;;;; (20784 36406 653593 0))
24400;;; Generated autoloads from textmodes/sgml-mode.el 24405;;; Generated autoloads from textmodes/sgml-mode.el
24401 24406
24402(autoload 'sgml-mode "sgml-mode" "\ 24407(autoload 'sgml-mode "sgml-mode" "\
@@ -24664,8 +24669,8 @@ Otherwise, one argument `-i' is passed to the shell.
24664 24669
24665;;;*** 24670;;;***
24666 24671
24667;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20709 24672;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20768
24668;;;;;; 26818 907104 0)) 24673;;;;;; 48184 78670 0))
24669;;; Generated autoloads from gnus/shr.el 24674;;; Generated autoloads from gnus/shr.el
24670 24675
24671(autoload 'shr-insert-document "shr" "\ 24676(autoload 'shr-insert-document "shr" "\
@@ -24720,8 +24725,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
24720 24725
24721;;;*** 24726;;;***
24722 24727
24723;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20709 24728;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20777
24724;;;;;; 26818 907104 0)) 24729;;;;;; 63161 848428 0))
24725;;; Generated autoloads from progmodes/simula.el 24730;;; Generated autoloads from progmodes/simula.el
24726 24731
24727(autoload 'simula-mode "simula" "\ 24732(autoload 'simula-mode "simula" "\
@@ -26796,7 +26801,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
26796;;;*** 26801;;;***
26797 26802
26798;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" 26803;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
26799;;;;;; "progmodes/tcl.el" (20709 26818 907104 0)) 26804;;;;;; "progmodes/tcl.el" (20774 53405 704746 172000))
26800;;; Generated autoloads from progmodes/tcl.el 26805;;; Generated autoloads from progmodes/tcl.el
26801 26806
26802(autoload 'tcl-mode "tcl" "\ 26807(autoload 'tcl-mode "tcl" "\
@@ -26956,7 +26961,7 @@ tetris-mode keybindings:
26956;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command 26961;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command
26957;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp 26962;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp
26958;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" 26963;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el"
26959;;;;;; (20709 26818 907104 0)) 26964;;;;;; (20774 53405 754743 8000))
26960;;; Generated autoloads from textmodes/tex-mode.el 26965;;; Generated autoloads from textmodes/tex-mode.el
26961 26966
26962(defvar tex-shell-file-name nil "\ 26967(defvar tex-shell-file-name nil "\
@@ -27413,7 +27418,7 @@ Compose Thai characters in the current buffer.
27413 27418
27414;;;### (autoloads (list-at-point number-at-point symbol-at-point 27419;;;### (autoloads (list-at-point number-at-point symbol-at-point
27415;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) 27420;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing)
27416;;;;;; "thingatpt" "thingatpt.el" (20709 26818 907104 0)) 27421;;;;;; "thingatpt" "thingatpt.el" (20752 26669 524456 0))
27417;;; Generated autoloads from thingatpt.el 27422;;; Generated autoloads from thingatpt.el
27418 27423
27419(autoload 'forward-thing "thingatpt" "\ 27424(autoload 'forward-thing "thingatpt" "\
@@ -27959,7 +27964,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\".
27959;;;*** 27964;;;***
27960 27965
27961;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" 27966;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm"
27962;;;;;; "tmm.el" (20709 26818 907104 0)) 27967;;;;;; "tmm.el" (20764 51137 83502 0))
27963;;; Generated autoloads from tmm.el 27968;;; Generated autoloads from tmm.el
27964 (define-key global-map "\M-`" 'tmm-menubar) 27969 (define-key global-map "\M-`" 'tmm-menubar)
27965 (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) 27970 (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse)
@@ -28245,7 +28250,7 @@ changing the window configuration.
28245;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion 28250;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
28246;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers 28251;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
28247;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" 28252;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp"
28248;;;;;; "net/tramp.el" (20746 21181 635406 0)) 28253;;;;;; "net/tramp.el" (20784 36406 653593 0))
28249;;; Generated autoloads from net/tramp.el 28254;;; Generated autoloads from net/tramp.el
28250 28255
28251(defvar tramp-mode t "\ 28256(defvar tramp-mode t "\
@@ -28388,8 +28393,8 @@ Discard Tramp from loading remote files.
28388 28393
28389;;;*** 28394;;;***
28390 28395
28391;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20709 28396;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20760
28392;;;;;; 26818 907104 0)) 28397;;;;;; 54070 584283 0))
28393;;; Generated autoloads from tutorial.el 28398;;; Generated autoloads from tutorial.el
28394 28399
28395(autoload 'help-with-tutorial "tutorial" "\ 28400(autoload 'help-with-tutorial "tutorial" "\
@@ -28425,7 +28430,7 @@ resumed later.
28425;;;*** 28430;;;***
28426 28431
28427;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" 28432;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column"
28428;;;;;; "textmodes/two-column.el" (20709 26818 907104 0)) 28433;;;;;; "textmodes/two-column.el" (20763 30266 231060 0))
28429;;; Generated autoloads from textmodes/two-column.el 28434;;; Generated autoloads from textmodes/two-column.el
28430 (autoload '2C-command "two-column" () t 'keymap) 28435 (autoload '2C-command "two-column" () t 'keymap)
28431 (global-set-key "\C-x6" '2C-command) 28436 (global-set-key "\C-x6" '2C-command)
@@ -28836,7 +28841,7 @@ RATING a rating between 1 and 10 of the strength of the authentication.
28836;;;*** 28841;;;***
28837 28842
28838;;;### (autoloads (url-cache-extract url-is-cached url-store-in-cache) 28843;;;### (autoloads (url-cache-extract url-is-cached url-store-in-cache)
28839;;;;;; "url-cache" "url/url-cache.el" (20709 26818 907104 0)) 28844;;;;;; "url-cache" "url/url-cache.el" (20751 39094 700824 0))
28840;;; Generated autoloads from url/url-cache.el 28845;;; Generated autoloads from url/url-cache.el
28841 28846
28842(autoload 'url-store-in-cache "url-cache" "\ 28847(autoload 'url-store-in-cache "url-cache" "\
@@ -28989,8 +28994,8 @@ accessible.
28989 28994
28990;;;*** 28995;;;***
28991 28996
28992;;;### (autoloads nil "url-http" "url/url-http.el" (20709 26818 907104 28997;;;### (autoloads nil "url-http" "url/url-http.el" (20766 59628 334727
28993;;;;;; 0)) 28998;;;;;; 618000))
28994;;; Generated autoloads from url/url-http.el 28999;;; Generated autoloads from url/url-http.el
28995 (autoload 'url-default-expander "url-expand") 29000 (autoload 'url-default-expander "url-expand")
28996 29001
@@ -29491,8 +29496,8 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
29491;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers 29496;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers
29492;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff 29497;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff
29493;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook 29498;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook
29494;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20713 29499;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20752
29495;;;;;; 23861 754849 0)) 29500;;;;;; 26669 524456 0))
29496;;; Generated autoloads from vc/vc.el 29501;;; Generated autoloads from vc/vc.el
29497 29502
29498(defvar vc-checkout-hook nil "\ 29503(defvar vc-checkout-hook nil "\
@@ -29811,18 +29816,18 @@ mode-specific menu. `vc-annotate-color-map' and
29811 29816
29812;;;*** 29817;;;***
29813 29818
29814;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20709 26818 907104 29819;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20748 62911 684442
29815;;;;;; 0)) 29820;;;;;; 0))
29816;;; Generated autoloads from vc/vc-arch.el 29821;;; Generated autoloads from vc/vc-arch.el
29817 (defun vc-arch-registered (file) 29822 (defun vc-arch-registered (file)
29818 (if (vc-find-root file "{arch}/=tagging-method") 29823 (if (vc-find-root file "{arch}/=tagging-method")
29819 (progn 29824 (progn
29820 (load "vc-arch") 29825 (load "vc-arch" nil t)
29821 (vc-arch-registered file)))) 29826 (vc-arch-registered file))))
29822 29827
29823;;;*** 29828;;;***
29824 29829
29825;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20721 17977 14204 29830;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20748 62911 684442
29826;;;;;; 0)) 29831;;;;;; 0))
29827;;; Generated autoloads from vc/vc-bzr.el 29832;;; Generated autoloads from vc/vc-bzr.el
29828 29833
@@ -29834,19 +29839,19 @@ Name of the format file in a .bzr directory.")
29834 (defun vc-bzr-registered (file) 29839 (defun vc-bzr-registered (file)
29835 (if (vc-find-root file vc-bzr-admin-checkout-format-file) 29840 (if (vc-find-root file vc-bzr-admin-checkout-format-file)
29836 (progn 29841 (progn
29837 (load "vc-bzr") 29842 (load "vc-bzr" nil t)
29838 (vc-bzr-registered file)))) 29843 (vc-bzr-registered file))))
29839 29844
29840;;;*** 29845;;;***
29841 29846
29842;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20709 26818 907104 29847;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20748 62911 684442
29843;;;;;; 0)) 29848;;;;;; 0))
29844;;; Generated autoloads from vc/vc-cvs.el 29849;;; Generated autoloads from vc/vc-cvs.el
29845(defun vc-cvs-registered (f) 29850(defun vc-cvs-registered (f)
29846 "Return non-nil if file F is registered with CVS." 29851 "Return non-nil if file F is registered with CVS."
29847 (when (file-readable-p (expand-file-name 29852 (when (file-readable-p (expand-file-name
29848 "CVS/Entries" (file-name-directory f))) 29853 "CVS/Entries" (file-name-directory f)))
29849 (load "vc-cvs") 29854 (load "vc-cvs" nil t)
29850 (vc-cvs-registered f))) 29855 (vc-cvs-registered f)))
29851 29856
29852;;;*** 29857;;;***
@@ -29939,30 +29944,30 @@ case, and the process object in the asynchronous case.
29939 29944
29940;;;*** 29945;;;***
29941 29946
29942;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20709 26818 907104 29947;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20748 62911 684442
29943;;;;;; 0)) 29948;;;;;; 0))
29944;;; Generated autoloads from vc/vc-git.el 29949;;; Generated autoloads from vc/vc-git.el
29945 (defun vc-git-registered (file) 29950 (defun vc-git-registered (file)
29946 "Return non-nil if FILE is registered with git." 29951 "Return non-nil if FILE is registered with git."
29947 (if (vc-find-root file ".git") ; Short cut. 29952 (if (vc-find-root file ".git") ; Short cut.
29948 (progn 29953 (progn
29949 (load "vc-git") 29954 (load "vc-git" nil t)
29950 (vc-git-registered file)))) 29955 (vc-git-registered file))))
29951 29956
29952;;;*** 29957;;;***
29953 29958
29954;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20709 26818 907104 0)) 29959;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20748 62911 684442 0))
29955;;; Generated autoloads from vc/vc-hg.el 29960;;; Generated autoloads from vc/vc-hg.el
29956 (defun vc-hg-registered (file) 29961 (defun vc-hg-registered (file)
29957 "Return non-nil if FILE is registered with hg." 29962 "Return non-nil if FILE is registered with hg."
29958 (if (vc-find-root file ".hg") ; short cut 29963 (if (vc-find-root file ".hg") ; short cut
29959 (progn 29964 (progn
29960 (load "vc-hg") 29965 (load "vc-hg" nil t)
29961 (vc-hg-registered file)))) 29966 (vc-hg-registered file))))
29962 29967
29963;;;*** 29968;;;***
29964 29969
29965;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20709 26818 907104 29970;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20748 62911 684442
29966;;;;;; 0)) 29971;;;;;; 0))
29967;;; Generated autoloads from vc/vc-mtn.el 29972;;; Generated autoloads from vc/vc-mtn.el
29968 29973
@@ -29974,7 +29979,7 @@ Name of the monotone directory's format file.")
29974 (defun vc-mtn-registered (file) 29979 (defun vc-mtn-registered (file)
29975 (if (vc-find-root file vc-mtn-admin-format) 29980 (if (vc-find-root file vc-mtn-admin-format)
29976 (progn 29981 (progn
29977 (load "vc-mtn") 29982 (load "vc-mtn" nil t)
29978 (vc-mtn-registered file)))) 29983 (vc-mtn-registered file))))
29979 29984
29980;;;*** 29985;;;***
@@ -30012,7 +30017,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
30012 30017
30013;;;*** 30018;;;***
30014 30019
30015;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20709 26818 907104 30020;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20760 54070 584283
30016;;;;;; 0)) 30021;;;;;; 0))
30017;;; Generated autoloads from vc/vc-svn.el 30022;;; Generated autoloads from vc/vc-svn.el
30018 (defun vc-svn-registered (f) 30023 (defun vc-svn-registered (f)
@@ -30021,13 +30026,13 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
30021 "_svn") 30026 "_svn")
30022 (t ".svn")))) 30027 (t ".svn"))))
30023 (when (vc-find-root f admin-dir) 30028 (when (vc-find-root f admin-dir)
30024 (load "vc-svn") 30029 (load "vc-svn" nil t)
30025 (vc-svn-registered f)))) 30030 (vc-svn-registered f))))
30026 30031
30027;;;*** 30032;;;***
30028 30033
30029;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el" 30034;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el"
30030;;;;;; (20709 26818 907104 0)) 30035;;;;;; (20777 63161 848428 0))
30031;;; Generated autoloads from progmodes/vera-mode.el 30036;;; Generated autoloads from progmodes/vera-mode.el
30032 (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) 30037 (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode))
30033 30038
@@ -30085,7 +30090,7 @@ Key bindings:
30085;;;*** 30090;;;***
30086 30091
30087;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el" 30092;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el"
30088;;;;;; (20709 26818 907104 0)) 30093;;;;;; (20763 30266 231060 0))
30089;;; Generated autoloads from progmodes/verilog-mode.el 30094;;; Generated autoloads from progmodes/verilog-mode.el
30090 30095
30091(autoload 'verilog-mode "verilog-mode" "\ 30096(autoload 'verilog-mode "verilog-mode" "\
@@ -30882,7 +30887,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics.
30882;;;;;; view-mode view-buffer-other-frame view-buffer-other-window 30887;;;;;; view-mode view-buffer-other-frame view-buffer-other-window
30883;;;;;; view-buffer view-file-other-frame view-file-other-window 30888;;;;;; view-buffer view-file-other-frame view-file-other-window
30884;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting) 30889;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting)
30885;;;;;; "view" "view.el" (20710 47669 981323 0)) 30890;;;;;; "view" "view.el" (20762 9398 526093 0))
30886;;; Generated autoloads from view.el 30891;;; Generated autoloads from view.el
30887 30892
30888(defvar view-remove-frame-by-deleting t "\ 30893(defvar view-remove-frame-by-deleting t "\
@@ -31044,8 +31049,8 @@ Digits provide prefix arguments.
31044\\[View-scroll-to-buffer-end] scroll so that buffer end is at last line of window. 31049\\[View-scroll-to-buffer-end] scroll so that buffer end is at last line of window.
31045SPC scroll forward \"page size\" lines. 31050SPC scroll forward \"page size\" lines.
31046 With prefix scroll forward prefix lines. 31051 With prefix scroll forward prefix lines.
31047DEL scroll backward \"page size\" lines. 31052DEL, S-SPC scroll backward \"page size\" lines.
31048 With prefix scroll backward prefix lines. 31053 With prefix scroll backward prefix lines.
31049\\[View-scroll-page-forward-set-page-size] like \\[View-scroll-page-forward] but with prefix sets \"page size\" to prefix. 31054\\[View-scroll-page-forward-set-page-size] like \\[View-scroll-page-forward] but with prefix sets \"page size\" to prefix.
31050\\[View-scroll-page-backward-set-page-size] like \\[View-scroll-page-backward] but with prefix sets \"page size\" to prefix. 31055\\[View-scroll-page-backward-set-page-size] like \\[View-scroll-page-backward] but with prefix sets \"page size\" to prefix.
31051\\[View-scroll-half-page-forward] scroll forward \"half page size\" lines. With prefix, sets 31056\\[View-scroll-half-page-forward] scroll forward \"half page size\" lines. With prefix, sets
@@ -31138,8 +31143,8 @@ Exit View mode and make the current buffer editable.
31138 31143
31139;;;*** 31144;;;***
31140 31145
31141;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20709 31146;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20762
31142;;;;;; 26818 907104 0)) 31147;;;;;; 9398 526093 0))
31143;;; Generated autoloads from emulation/vip.el 31148;;; Generated autoloads from emulation/vip.el
31144 31149
31145(autoload 'vip-setup "vip" "\ 31150(autoload 'vip-setup "vip" "\
@@ -32065,7 +32070,7 @@ Example:
32065;;;*** 32070;;;***
32066 32071
32067;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" 32072;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
32068;;;;;; (20738 27061 124069 0)) 32073;;;;;; (20766 6456 368550 0))
32069;;; Generated autoloads from xml.el 32074;;; Generated autoloads from xml.el
32070 32075
32071(autoload 'xml-parse-file "xml" "\ 32076(autoload 'xml-parse-file "xml" "\
@@ -32186,33 +32191,6 @@ Extract file name from an yenc header.
32186 32191
32187;;;*** 32192;;;***
32188 32193
32189;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism
32190;;;;;; yow) "yow" "play/yow.el" (20709 26818 907104 0))
32191;;; Generated autoloads from play/yow.el
32192
32193(autoload 'yow "yow" "\
32194Return or display a random Zippy quotation. With prefix arg, insert it.
32195
32196\(fn &optional INSERT DISPLAY)" t nil)
32197
32198(autoload 'insert-zippyism "yow" "\
32199Prompt with completion for a known Zippy quotation, and insert it at point.
32200
32201\(fn &optional ZIPPYISM)" t nil)
32202
32203(autoload 'apropos-zippy "yow" "\
32204Return a list of all Zippy quotes matching REGEXP.
32205If called interactively, display a list of matches.
32206
32207\(fn REGEXP)" t nil)
32208
32209(autoload 'psychoanalyze-pinhead "yow" "\
32210Zippy goes to the analyst.
32211
32212\(fn)" t nil)
32213
32214;;;***
32215
32216;;;### (autoloads (zone) "zone" "play/zone.el" (20709 26818 907104 32194;;;### (autoloads (zone) "zone" "play/zone.el" (20709 26818 907104
32217;;;;;; 0)) 32195;;;;;; 0))
32218;;; Generated autoloads from play/zone.el 32196;;; Generated autoloads from play/zone.el
@@ -32433,8 +32411,8 @@ Zone out, completely.
32433;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" 32411;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el"
32434;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" 32412;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el"
32435;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" 32413;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el"
32436;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (20747 42275 915429 32414;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (20784 36426 559404
32437;;;;;; 589000)) 32415;;;;;; 170000))
32438 32416
32439;;;*** 32417;;;***
32440 32418
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index cc28bab733f..82c1ce010b8 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -358,7 +358,7 @@ This variable is only used if the variable
358;; Todo: This data could be saved in a bookmark. 358;; Todo: This data could be saved in a bookmark.
359(defvar net-utils--revert-cmd nil) 359(defvar net-utils--revert-cmd nil)
360 360
361(defun net-utils-run-simple (buffer program-name args) 361(defun net-utils-run-simple (buffer program-name args &optional nodisplay)
362 "Run a network utility for diagnostic output only." 362 "Run a network utility for diagnostic output only."
363 (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer) 363 (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer)
364 (let ((proc (get-buffer-process (current-buffer)))) 364 (let ((proc (get-buffer-process (current-buffer))))
@@ -369,13 +369,14 @@ This variable is only used if the variable
369 (erase-buffer)) 369 (erase-buffer))
370 (net-utils-mode) 370 (net-utils-mode)
371 (setq-local net-utils--revert-cmd 371 (setq-local net-utils--revert-cmd
372 `(net-utils-run-simple ,(current-buffer) ,program-name ,args)) 372 `(net-utils-run-simple ,(current-buffer)
373 ,program-name ,args nodisplay))
373 (set-process-filter 374 (set-process-filter
374 (apply 'start-process program-name 375 (apply 'start-process program-name
375 (current-buffer) program-name args) 376 (current-buffer) program-name args)
376 'net-utils-remove-ctrl-m-filter) 377 'net-utils-remove-ctrl-m-filter)
377 (goto-char (point-min)) 378 (goto-char (point-min))
378 (display-buffer (current-buffer)))) 379 (unless nodisplay (display-buffer (current-buffer)))))
379 380
380(defun net-utils--revert-function (&optional ignore-auto noconfirm) 381(defun net-utils--revert-function (&optional ignore-auto noconfirm)
381 (message "Reverting `%s'..." (buffer-name)) 382 (message "Reverting `%s'..." (buffer-name))
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 766dcdbbe6a..910356fbb6c 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -49,7 +49,7 @@
49 "*When this method name is used, forward all calls to Android Debug Bridge.") 49 "*When this method name is used, forward all calls to Android Debug Bridge.")
50 50
51(defcustom tramp-adb-prompt 51(defcustom tramp-adb-prompt
52 "^\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" 52 "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
53 "Regexp used as prompt in almquist shell." 53 "Regexp used as prompt in almquist shell."
54 :type 'string 54 :type 'string
55 :version "24.4" 55 :version "24.4"
@@ -775,13 +775,11 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
775 ;; directory. 775 ;; directory.
776 (condition-case nil 776 (condition-case nil
777 (progn 777 (progn
778 (setq ret 0 778 (setq ret 0)
779 ret 779 (tramp-adb-barf-unless-okay
780 (tramp-adb-barf-unless-okay 780 v (format "(cd %s; %s)"
781 v (format "(cd %s; %s)" 781 (tramp-shell-quote-argument localname) command)
782 (tramp-shell-quote-argument localname) 782 "")
783 command)
784 ""))
785 ;; We should show the output anyway. 783 ;; We should show the output anyway.
786 (when outbuf 784 (when outbuf
787 (with-current-buffer outbuf 785 (with-current-buffer outbuf
@@ -1011,34 +1009,31 @@ This happens for Android >= 4.0."
1011 (while (re-search-forward "\r+$" nil t) 1009 (while (re-search-forward "\r+$" nil t)
1012 (replace-match "" nil nil))))) 1010 (replace-match "" nil nil)))))
1013 1011
1014(defun tramp-adb-barf-unless-okay (vec command fmt &rest args)
1015 "Run COMMAND, check exit status, throw error if exit status not okay.
1016FMT and ARGS are passed to `error'."
1017 (tramp-adb-send-command vec (format "%s; echo tramp_exit_status $?" command))
1018 (with-current-buffer (tramp-get-connection-buffer vec)
1019 (goto-char (point-max))
1020 (unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
1021 (tramp-error
1022 vec 'file-error "Couldn't find exit status of `%s'" command))
1023 (skip-chars-forward "^ ")
1024 (unless (zerop (read (current-buffer)))
1025 (apply 'tramp-error vec 'file-error fmt args))
1026 (let (buffer-read-only)
1027 (delete-region (match-beginning 0) (point-max)))))
1028
1029(defun tramp-adb-command-exit-status 1012(defun tramp-adb-command-exit-status
1030 (vec command) 1013 (vec command)
1031 "Run COMMAND and return its exit status. 1014 "Run COMMAND and return its exit status.
1032Sends `echo $?' along with the COMMAND for checking the exit status. If 1015Sends `echo $?' along with the COMMAND for checking the exit status. If
1033COMMAND is nil, just sends `echo $?'. Returns the exit status found." 1016COMMAND is nil, just sends `echo $?'. Returns the exit status found."
1034 (tramp-adb-send-command vec (format "%s; echo tramp_exit_status $?" command)) 1017 (tramp-adb-send-command
1018 vec (if command
1019 (format "%s; echo tramp_exit_status $?" command)
1020 "echo tramp_exit_status $?"))
1035 (with-current-buffer (tramp-get-connection-buffer vec) 1021 (with-current-buffer (tramp-get-connection-buffer vec)
1036 (goto-char (point-max)) 1022 (goto-char (point-max))
1037 (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) 1023 (unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
1038 (tramp-error 1024 (tramp-error
1039 vec 'file-error "Couldn't find exit status of `%s'" command)) 1025 vec 'file-error "Couldn't find exit status of `%s'" command))
1040 (skip-chars-forward "^ ") 1026 (skip-chars-forward "^ ")
1041 (read (current-buffer)))) 1027 (prog1
1028 (read (current-buffer))
1029 (let (buffer-read-only)
1030 (delete-region (match-beginning 0) (point-max))))))
1031
1032(defun tramp-adb-barf-unless-okay (vec command fmt &rest args)
1033 "Run COMMAND, check exit status, throw error if exit status not okay.
1034FMT and ARGS are passed to `error'."
1035 (unless (zerop (tramp-adb-command-exit-status vec command))
1036 (apply 'tramp-error vec 'file-error fmt args)))
1042 1037
1043(defun tramp-adb-wait-for-output (proc &optional timeout) 1038(defun tramp-adb-wait-for-output (proc &optional timeout)
1044 "Wait for output from remote command." 1039 "Wait for output from remote command."
@@ -1077,6 +1072,7 @@ connection if a previous connection has died for some reason."
1077 (let* ((buf (tramp-get-connection-buffer vec)) 1072 (let* ((buf (tramp-get-connection-buffer vec))
1078 (p (get-buffer-process buf)) 1073 (p (get-buffer-process buf))
1079 (host (tramp-file-name-host vec)) 1074 (host (tramp-file-name-host vec))
1075 (user (tramp-file-name-user vec))
1080 (devices (mapcar 'cadr (tramp-adb-parse-device-names nil)))) 1076 (devices (mapcar 'cadr (tramp-adb-parse-device-names nil))))
1081 (unless 1077 (unless
1082 (and p (processp p) (memq (process-status p) '(run open))) 1078 (and p (processp p) (memq (process-status p) '(run open)))
@@ -1132,6 +1128,13 @@ connection if a previous connection has died for some reason."
1132 old-getprop new-getprop) 1128 old-getprop new-getprop)
1133 (tramp-adb-maybe-open-connection vec))) 1129 (tramp-adb-maybe-open-connection vec)))
1134 1130
1131 ;; Change user if indicated.
1132 (when user
1133 (tramp-adb-send-command vec (format "su %s" user))
1134 (unless (zerop (tramp-adb-command-exit-status vec nil))
1135 (delete-process p)
1136 (tramp-error vec 'file-error "Cannot switch to user %s" user)))
1137
1135 ;; Set "remote-path" connection property. This is needed 1138 ;; Set "remote-path" connection property. This is needed
1136 ;; for eshell. 1139 ;; for eshell.
1137 (tramp-adb-send-command vec "echo \\\"$PATH\\\"") 1140 (tramp-adb-send-command vec "echo \\\"$PATH\\\"")
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e2aaafb38dd..9dd37fdf63a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -126,42 +126,6 @@ detected as prompt when being sent on echoing hosts, therefore.")
126 (tramp-default-port 22))) 126 (tramp-default-port 22)))
127;;;###tramp-autoload 127;;;###tramp-autoload
128(add-to-list 'tramp-methods 128(add-to-list 'tramp-methods
129 '("scp1"
130 (tramp-login-program "ssh")
131 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
132 ("-1") ("-e" "none") ("%h")))
133 (tramp-async-args (("-q")))
134 (tramp-remote-shell "/bin/sh")
135 (tramp-remote-shell-args ("-c"))
136 (tramp-copy-program "scp")
137 (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k")
138 ("-q") ("-r") ("%c")))
139 (tramp-copy-keep-date t)
140 (tramp-copy-recursive t)
141 (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
142 ("-o" "UserKnownHostsFile=/dev/null")
143 ("-o" "StrictHostKeyChecking=no")))
144 (tramp-default-port 22)))
145;;;###tramp-autoload
146(add-to-list 'tramp-methods
147 '("scp2"
148 (tramp-login-program "ssh")
149 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
150 ("-2") ("-e" "none") ("%h")))
151 (tramp-async-args (("-q")))
152 (tramp-remote-shell "/bin/sh")
153 (tramp-remote-shell-args ("-c"))
154 (tramp-copy-program "scp")
155 (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k")
156 ("-q") ("-r") ("%c")))
157 (tramp-copy-keep-date t)
158 (tramp-copy-recursive t)
159 (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
160 ("-o" "UserKnownHostsFile=/dev/null")
161 ("-o" "StrictHostKeyChecking=no")))
162 (tramp-default-port 22)))
163;;;###tramp-autoload
164(add-to-list 'tramp-methods
165 '("scpx" 129 '("scpx"
166 (tramp-login-program "ssh") 130 (tramp-login-program "ssh")
167 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") 131 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
@@ -233,32 +197,6 @@ detected as prompt when being sent on echoing hosts, therefore.")
233 (tramp-default-port 22))) 197 (tramp-default-port 22)))
234;;;###tramp-autoload 198;;;###tramp-autoload
235(add-to-list 'tramp-methods 199(add-to-list 'tramp-methods
236 '("ssh1"
237 (tramp-login-program "ssh")
238 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
239 ("-1") ("-e" "none") ("%h")))
240 (tramp-async-args (("-q")))
241 (tramp-remote-shell "/bin/sh")
242 (tramp-remote-shell-args ("-c"))
243 (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
244 ("-o" "UserKnownHostsFile=/dev/null")
245 ("-o" "StrictHostKeyChecking=no")))
246 (tramp-default-port 22)))
247;;;###tramp-autoload
248(add-to-list 'tramp-methods
249 '("ssh2"
250 (tramp-login-program "ssh")
251 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
252 ("-2") ("-e" "none") ("%h")))
253 (tramp-async-args (("-q")))
254 (tramp-remote-shell "/bin/sh")
255 (tramp-remote-shell-args ("-c"))
256 (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null")
257 ("-o" "UserKnownHostsFile=/dev/null")
258 ("-o" "StrictHostKeyChecking=no")))
259 (tramp-default-port 22)))
260;;;###tramp-autoload
261(add-to-list 'tramp-methods
262 '("sshx" 200 '("sshx"
263 (tramp-login-program "ssh") 201 (tramp-login-program "ssh")
264 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") 202 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
@@ -316,14 +254,6 @@ detected as prompt when being sent on echoing hosts, therefore.")
316 (tramp-default-port 22))) 254 (tramp-default-port 22)))
317;;;###tramp-autoload 255;;;###tramp-autoload
318(add-to-list 'tramp-methods 256(add-to-list 'tramp-methods
319 '("plink1"
320 (tramp-login-program "plink")
321 (tramp-login-args (("-l" "%u") ("-P" "%p") ("-1" "-ssh") ("%h")))
322 (tramp-remote-shell "/bin/sh")
323 (tramp-remote-shell-args ("-c"))
324 (tramp-default-port 22)))
325;;;###tramp-autoload
326(add-to-list 'tramp-methods
327 `("plinkx" 257 `("plinkx"
328 (tramp-login-program "plink") 258 (tramp-login-program "plink")
329 ;; ("%h") must be a single element, see 259 ;; ("%h") must be a single element, see
@@ -436,16 +366,12 @@ detected as prompt when being sent on echoing hosts, therefore.")
436 (tramp-set-completion-function "rcp" tramp-completion-function-alist-rsh) 366 (tramp-set-completion-function "rcp" tramp-completion-function-alist-rsh)
437 (tramp-set-completion-function "remcp" tramp-completion-function-alist-rsh) 367 (tramp-set-completion-function "remcp" tramp-completion-function-alist-rsh)
438 (tramp-set-completion-function "scp" tramp-completion-function-alist-ssh) 368 (tramp-set-completion-function "scp" tramp-completion-function-alist-ssh)
439 (tramp-set-completion-function "scp1" tramp-completion-function-alist-ssh)
440 (tramp-set-completion-function "scp2" tramp-completion-function-alist-ssh)
441 (tramp-set-completion-function "scpx" tramp-completion-function-alist-ssh) 369 (tramp-set-completion-function "scpx" tramp-completion-function-alist-ssh)
442 (tramp-set-completion-function "sftp" tramp-completion-function-alist-ssh) 370 (tramp-set-completion-function "sftp" tramp-completion-function-alist-ssh)
443 (tramp-set-completion-function "rsync" tramp-completion-function-alist-ssh) 371 (tramp-set-completion-function "rsync" tramp-completion-function-alist-ssh)
444 (tramp-set-completion-function "rsh" tramp-completion-function-alist-rsh) 372 (tramp-set-completion-function "rsh" tramp-completion-function-alist-rsh)
445 (tramp-set-completion-function "remsh" tramp-completion-function-alist-rsh) 373 (tramp-set-completion-function "remsh" tramp-completion-function-alist-rsh)
446 (tramp-set-completion-function "ssh" tramp-completion-function-alist-ssh) 374 (tramp-set-completion-function "ssh" tramp-completion-function-alist-ssh)
447 (tramp-set-completion-function "ssh1" tramp-completion-function-alist-ssh)
448 (tramp-set-completion-function "ssh2" tramp-completion-function-alist-ssh)
449 (tramp-set-completion-function "sshx" tramp-completion-function-alist-ssh) 375 (tramp-set-completion-function "sshx" tramp-completion-function-alist-ssh)
450 (tramp-set-completion-function 376 (tramp-set-completion-function
451 "telnet" tramp-completion-function-alist-telnet) 377 "telnet" tramp-completion-function-alist-telnet)
@@ -456,8 +382,6 @@ detected as prompt when being sent on echoing hosts, therefore.")
456 "krlogin" tramp-completion-function-alist-rsh) 382 "krlogin" tramp-completion-function-alist-rsh)
457 (tramp-set-completion-function "plink" tramp-completion-function-alist-ssh) 383 (tramp-set-completion-function "plink" tramp-completion-function-alist-ssh)
458 (tramp-set-completion-function 384 (tramp-set-completion-function
459 "plink1" tramp-completion-function-alist-ssh)
460 (tramp-set-completion-function
461 "plinkx" tramp-completion-function-alist-putty) 385 "plinkx" tramp-completion-function-alist-putty)
462 (tramp-set-completion-function "pscp" tramp-completion-function-alist-ssh) 386 (tramp-set-completion-function "pscp" tramp-completion-function-alist-ssh)
463 (tramp-set-completion-function "fcp" tramp-completion-function-alist-ssh))) 387 (tramp-set-completion-function "fcp" tramp-completion-function-alist-ssh)))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e5e69492130..d959cfc854a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1170,21 +1170,45 @@ If the `tramp-methods' entry does not exist, return nil."
1170 (and (stringp name) 1170 (and (stringp name)
1171 (string-match tramp-file-name-regexp name)))) 1171 (string-match tramp-file-name-regexp name))))
1172 1172
1173;; Obsoleted with Tramp 2.2.7.
1174(defconst tramp-obsolete-methods
1175 '("ssh1" "ssh2" "scp1" "scp2" "scpc" "rsyncc" "plink1")
1176 "Obsolete methods.")
1177
1178(defvar tramp-warned-obsolete-methods nil
1179 "Which methods the user has been warned to be obsolete.")
1180
1173(defun tramp-find-method (method user host) 1181(defun tramp-find-method (method user host)
1174 "Return the right method string to use. 1182 "Return the right method string to use.
1175This is METHOD, if non-nil. Otherwise, do a lookup in 1183This is METHOD, if non-nil. Otherwise, do a lookup in
1176`tramp-default-method-alist'." 1184`tramp-default-method-alist'. It maps also obsolete methods to
1177 (or method 1185their replacement."
1178 (let ((choices tramp-default-method-alist) 1186 (let ((result
1179 lmethod item) 1187 (or method
1180 (while choices 1188 (let ((choices tramp-default-method-alist)
1181 (setq item (pop choices)) 1189 lmethod item)
1182 (when (and (string-match (or (nth 0 item) "") (or host "")) 1190 (while choices
1183 (string-match (or (nth 1 item) "") (or user ""))) 1191 (setq item (pop choices))
1184 (setq lmethod (nth 2 item)) 1192 (when (and (string-match (or (nth 0 item) "") (or host ""))
1185 (setq choices nil))) 1193 (string-match (or (nth 1 item) "") (or user "")))
1186 lmethod) 1194 (setq lmethod (nth 2 item))
1187 tramp-default-method)) 1195 (setq choices nil)))
1196 lmethod)
1197 tramp-default-method)))
1198 ;; This is needed for a transition period only.
1199 (when (member result tramp-obsolete-methods)
1200 (unless (member result tramp-warned-obsolete-methods)
1201 (if noninteractive
1202 (warn "Method %s is obsolete, using %s"
1203 result (substring result 0 -1))
1204 (unless (y-or-n-p (format "Method %s is obsolete, use %s? "
1205 result (substring result 0 -1)))
1206 (error 'file-error "Method \"%s\" not supported" result)))
1207 (add-to-list 'tramp-warned-obsolete-methods result))
1208 ;; This works with the current set of `tramp-obsolete-methods'.
1209 ;; Must be improved, if their are more sophisticated replacements.
1210 (setq result (substring result 0 -1)))
1211 result))
1188 1212
1189(defun tramp-find-user (method user host) 1213(defun tramp-find-user (method user host)
1190 "Return the right user string to use. 1214 "Return the right user string to use.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index d785b938f67..92e21c300c7 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -749,8 +749,10 @@ OTHERCHARS slots of the alist should contain the same character
749set as casechars and otherchars in the LANGUAGE.aff file \(e.g., 749set as casechars and otherchars in the LANGUAGE.aff file \(e.g.,
750english.aff\). aspell and hunspell don't have this limitation.") 750english.aff\). aspell and hunspell don't have this limitation.")
751 751
752(defvar ispell-really-aspell nil) ; Non-nil if we can use aspell extensions. 752(defvar ispell-really-aspell nil
753(defvar ispell-really-hunspell nil) ; Non-nil if we can use hunspell extensions. 753 "Non-nil if we can use aspell extensions.")
754(defvar ispell-really-hunspell nil
755 "Non-nil if we can use hunspell extensions.")
754(defvar ispell-encoding8-command nil 756(defvar ispell-encoding8-command nil
755 "Command line option prefix to select encoding if supported, nil otherwise. 757 "Command line option prefix to select encoding if supported, nil otherwise.
756If setting the encoding is supported by spellchecker and is selectable from 758If setting the encoding is supported by spellchecker and is selectable from
@@ -860,7 +862,7 @@ Otherwise returns the library directory name, if that is defined."
860 (if (string-match "\\`aspell" speller) "-v" "-vv")))) 862 (if (string-match "\\`aspell" speller) "-v" "-vv"))))
861 (goto-char (point-min)) 863 (goto-char (point-min))
862 (if interactivep 864 (if interactivep
863 ;; report version information of ispell and ispell.el 865 ;; Report version information of ispell and ispell.el
864 (progn 866 (progn
865 (end-of-line) 867 (end-of-line)
866 (setq result (concat (buffer-substring-no-properties (point-min) 868 (setq result (concat (buffer-substring-no-properties (point-min)
@@ -955,11 +957,12 @@ See `ispell-buffer-with-debug' for an example of use."
955 (erase-buffer))) 957 (erase-buffer)))
956 ispell-debug-buffer)) 958 ispell-debug-buffer))
957 959
958(defsubst ispell-print-if-debug (string) 960(defsubst ispell-print-if-debug (format &rest args)
959 "Print STRING to `ispell-debug-buffer' buffer if enabled." 961 "Print message to `ispell-debug-buffer' buffer if enabled."
960 (if (boundp 'ispell-debug-buffer) 962 (if (boundp 'ispell-debug-buffer)
961 (with-current-buffer ispell-debug-buffer 963 (with-current-buffer ispell-debug-buffer
962 (insert string)))) 964 (goto-char (point-max))
965 (insert (apply #'format format args)))))
963 966
964 967
965;; The preparation of the menu bar menu must be autoloaded 968;; The preparation of the menu bar menu must be autoloaded
@@ -1132,13 +1135,13 @@ Return the new dictionary alist."
1132;; Make ispell.el work better with hunspell. 1135;; Make ispell.el work better with hunspell.
1133 1136
1134(defvar ispell-hunspell-dict-paths-alist nil 1137(defvar ispell-hunspell-dict-paths-alist nil
1135 "Alist of parsed hunspell dicts and associated affix files. 1138 "Alist of parsed hunspell dicts and associated affix files.
1136Will be used to parse corresponding .aff file and create associated 1139Will be used to parse corresponding .aff file and create associated
1137parameters to be inserted into `ispell-hunspell-dictionary-alist'. 1140parameters to be inserted into `ispell-hunspell-dictionary-alist'.
1138Internal use.") 1141Internal use.")
1139 1142
1140(defvar ispell-hunspell-dictionary-alist nil 1143(defvar ispell-hunspell-dictionary-alist nil
1141 "Alist of parsed hunspell dicts and associated parameters. 1144 "Alist of parsed hunspell dicts and associated parameters.
1142This alist will initially contain names of found dicts. Associated 1145This alist will initially contain names of found dicts. Associated
1143parameters will be added when dict is used for the first time. 1146parameters will be added when dict is used for the first time.
1144Internal use.") 1147Internal use.")
@@ -1149,7 +1152,8 @@ Value will be extracted from hunspell affix file and used for
1149all uninitialized dicts using that affix file." 1152all uninitialized dicts using that affix file."
1150 (if (cadr (assoc dict ispell-dictionary-alist)) 1153 (if (cadr (assoc dict ispell-dictionary-alist))
1151 (message "ispell-hfde: Non void entry for %s. Skipping.\n" dict) 1154 (message "ispell-hfde: Non void entry for %s. Skipping.\n" dict)
1152 (let ((dict-alias (cadr (assoc dict ispell-hunspell-dictionary-equivs-alist))) 1155 (let ((dict-alias
1156 (cadr (assoc dict ispell-hunspell-dictionary-equivs-alist)))
1153 (use-for-dicts (list dict)) 1157 (use-for-dicts (list dict))
1154 (dict-args-cdr (cdr (ispell-parse-hunspell-affix-file dict))) 1158 (dict-args-cdr (cdr (ispell-parse-hunspell-affix-file dict)))
1155 newlist) 1159 newlist)
@@ -1161,10 +1165,12 @@ all uninitialized dicts using that affix file."
1161 (member dict-alias dict-equiv-alist-entry)) 1165 (member dict-alias dict-equiv-alist-entry))
1162 (dolist ( tmp-dict (list dict-equiv-key dict-equiv-value)) 1166 (dolist ( tmp-dict (list dict-equiv-key dict-equiv-value))
1163 (if (cadr (assoc tmp-dict ispell-dictionary-alist)) 1167 (if (cadr (assoc tmp-dict ispell-dictionary-alist))
1164 (ispell-print-if-debug (format "ispell-hfde: %s already expanded. Skipping.\n" tmp-dict)) 1168 (ispell-print-if-debug
1169 "ispell-hfde: %s already expanded. Skipping.\n" tmp-dict)
1165 (add-to-list 'use-for-dicts tmp-dict)))))) 1170 (add-to-list 'use-for-dicts tmp-dict))))))
1166 (ispell-print-if-debug (format "ispell-hfde: Filling %s entry. Use for %s.\n" dict use-for-dicts)) 1171 (ispell-print-if-debug
1167 ;; The final loop 1172 "ispell-hfde: Filling %s entry. Use for %s.\n" dict use-for-dicts)
1173 ;; The final loop.
1168 (dolist (entry ispell-dictionary-alist) 1174 (dolist (entry ispell-dictionary-alist)
1169 (if (member (car entry) use-for-dicts) 1175 (if (member (car entry) use-for-dicts)
1170 (add-to-list 'newlist 1176 (add-to-list 'newlist
@@ -1177,39 +1183,41 @@ all uninitialized dicts using that affix file."
1177Return a list in `ispell-dictionary-alist' format." 1183Return a list in `ispell-dictionary-alist' format."
1178 (let ((affix-file (cadr (assoc dict-key ispell-hunspell-dict-paths-alist)))) 1184 (let ((affix-file (cadr (assoc dict-key ispell-hunspell-dict-paths-alist))))
1179 (unless affix-file 1185 (unless affix-file
1180 (error "ispell-phaf: No matching entry for %s.\n" dict-name)) 1186 (error "ispell-phaf: No matching entry for %s.\n" dict-key))
1181 (if (file-exists-p affix-file) 1187 (if (not (file-exists-p affix-file))
1182 (let ((dict-name (file-name-sans-extension (file-name-nondirectory affix-file))) 1188 (error "ispell-phaf: File \"%s\" not found.\n" affix-file))
1183 otherchars-string otherchars-list) 1189 (let ((dict-name (file-name-sans-extension
1184 (with-temp-buffer 1190 (file-name-nondirectory affix-file)))
1185 (insert-file-contents affix-file) 1191 otherchars-string otherchars-list)
1186 (setq otherchars-string 1192 (with-temp-buffer
1187 (save-excursion 1193 (insert-file-contents affix-file)
1188 (beginning-of-buffer) 1194 (setq otherchars-string
1189 (if (search-forward-regexp "^WORDCHARS +" nil t ) 1195 (save-excursion
1190 (buffer-substring (point) 1196 (goto-char (point-min))
1191 (progn (end-of-line) (point)))))) 1197 (if (search-forward-regexp "^WORDCHARS +" nil t )
1192 ;; Remove trailing whitespace and extra stuff. Make list if non-nil. 1198 (buffer-substring (point)
1193 (setq otherchars-list 1199 (progn (end-of-line) (point))))))
1194 (if otherchars-string 1200 ;; Remove trailing whitespace and extra stuff. Make list if
1195 (split-string 1201 ;; non-nil.
1196 (if (string-match " +.*$" otherchars-string) 1202 (setq otherchars-list
1197 (replace-match "" nil nil otherchars-string) 1203 (if otherchars-string
1198 otherchars-string) 1204 (split-string
1199 "" t))) 1205 (if (string-match " +.*$" otherchars-string)
1200 1206 (replace-match "" nil nil otherchars-string)
1201 ;; Fill dict entry 1207 otherchars-string)
1202 (list dict-key 1208 "" t)))
1203 "[[:alpha:]]" 1209
1204 "[^[:alpha:]]" 1210 ;; Fill dict entry
1205 (if otherchars-list 1211 (list dict-key
1206 (regexp-opt otherchars-list) 1212 "[[:alpha:]]"
1207 "") 1213 "[^[:alpha:]]"
1208 t ;; many-otherchars-p: We can't tell, set to t 1214 (if otherchars-list
1209 (list "-d" dict-name) 1215 (regexp-opt otherchars-list)
1210 nil ;; extended-char-mode: not supported by hunspell 1216 "")
1211 'utf-8))) 1217 t ; many-otherchars-p: We can't tell, set to t.
1212 (error "ispell-phaf: File \"%s\" not found.\n" affix-file)))) 1218 (list "-d" dict-name)
1219 nil ; extended-char-mode: not supported by hunspell!
1220 'utf-8)))))
1213 1221
1214(defun ispell-find-hunspell-dictionaries () 1222(defun ispell-find-hunspell-dictionaries ()
1215 "Look for installed hunspell dictionaries. 1223 "Look for installed hunspell dictionaries.
@@ -1244,21 +1252,21 @@ entries if a specific dict was found."
1244 (if (and (not (assoc basename ispell-hunspell-dict-paths-alist)) 1252 (if (and (not (assoc basename ispell-hunspell-dict-paths-alist))
1245 (file-exists-p affix-file)) 1253 (file-exists-p affix-file))
1246 ;; Entry has an associated .aff file and no previous value. 1254 ;; Entry has an associated .aff file and no previous value.
1247 (progn 1255 (let ((affix-file (expand-file-name affix-file)))
1248 (ispell-print-if-debug 1256 (ispell-print-if-debug
1249 (format "++ ispell-fhd: dict-entry:%s name:%s basename:%s affix-file:%s\n" 1257 "++ ispell-fhd: dict-entry:%s name:%s basename:%s affix-file:%s\n"
1250 dict full-name basename affix-file)) 1258 dict full-name basename affix-file)
1251 (add-to-list 'ispell-hunspell-dict-paths-alist 1259 (add-to-list 'ispell-hunspell-dict-paths-alist
1252 (list basename affix-file))) 1260 (list basename affix-file)))
1253 (ispell-print-if-debug 1261 (ispell-print-if-debug
1254 (format "-- ispell-fhd: Skipping entry: %s\n" dict)))))) 1262 "-- ispell-fhd: Skipping entry: %s\n" dict)))))
1255 ;; Remove entry from aliases alist if explicit dict was found. 1263 ;; Remove entry from aliases alist if explicit dict was found.
1256 (let (newlist) 1264 (let (newlist)
1257 (dolist (dict ispell-hunspell-dictionary-equivs-alist) 1265 (dolist (dict ispell-hunspell-dictionary-equivs-alist)
1258 (if (assoc (car dict) ispell-hunspell-dict-paths-alist) 1266 (if (assoc (car dict) ispell-hunspell-dict-paths-alist)
1259 (ispell-print-if-debug 1267 (ispell-print-if-debug
1260 (format "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n" 1268 "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n"
1261 (car dict))) 1269 (car dict))
1262 (add-to-list 'newlist dict))) 1270 (add-to-list 'newlist dict)))
1263 (setq ispell-hunspell-dictionary-equivs-alist newlist)) 1271 (setq ispell-hunspell-dictionary-equivs-alist newlist))
1264 ;; Add known hunspell aliases 1272 ;; Add known hunspell aliases
@@ -1273,9 +1281,10 @@ entries if a specific dict was found."
1273 (if (and (assoc dict-equiv-value ispell-hunspell-dict-paths-alist) 1281 (if (and (assoc dict-equiv-value ispell-hunspell-dict-paths-alist)
1274 (not (assoc dict-equiv-key ispell-hunspell-dict-paths-alist)) 1282 (not (assoc dict-equiv-key ispell-hunspell-dict-paths-alist))
1275 (not (member dict-equiv-key exclude-aliases))) 1283 (not (member dict-equiv-key exclude-aliases)))
1276 (let ((affix-file (cadr (assoc dict-equiv-value ispell-hunspell-dict-paths-alist)))) 1284 (let ((affix-file (cadr (assoc dict-equiv-value
1277 (ispell-print-if-debug (format "++ ispell-fhd: Adding alias %s -> %s.\n" 1285 ispell-hunspell-dict-paths-alist))))
1278 dict-equiv-key affix-file)) 1286 (ispell-print-if-debug "++ ispell-fhd: Adding alias %s -> %s.\n"
1287 dict-equiv-key affix-file)
1279 (add-to-list 1288 (add-to-list
1280 'ispell-hunspell-dict-paths-alist 1289 'ispell-hunspell-dict-paths-alist
1281 (list dict-equiv-key affix-file)))))) 1290 (list dict-equiv-key affix-file))))))
@@ -3206,29 +3215,25 @@ amount for last line processed."
3206 (query-fcc t) 3215 (query-fcc t)
3207 in-comment key) 3216 in-comment key)
3208 (ispell-print-if-debug 3217 (ispell-print-if-debug
3209 (concat 3218 "ispell-region: (ispell-skip-region-list):\n%s
3210 (format 3219ispell-region: (ispell-begin-skip-region-regexp):\n%s
3211 "ispell-region: (ispell-skip-region-list):\n%s\n" 3220ispell-region: Search for first region to skip after (ispell-begin-skip-region-regexp)\n"
3212 (ispell-skip-region-list)) 3221 (ispell-skip-region-list)
3213 (format 3222 (ispell-begin-skip-region-regexp))
3214 "ispell-region: (ispell-begin-skip-region-regexp):\n%s\n"
3215 (ispell-begin-skip-region-regexp))
3216 "ispell-region: Search for first region to skip after (ispell-begin-skip-region-regexp)\n"))
3217 (if (re-search-forward (ispell-begin-skip-region-regexp) reg-end t) 3223 (if (re-search-forward (ispell-begin-skip-region-regexp) reg-end t)
3218 (progn 3224 (progn
3219 (setq key (match-string-no-properties 0)) 3225 (setq key (match-string-no-properties 0))
3220 (set-marker skip-region-start (- (point) (length key))) 3226 (set-marker skip-region-start (- (point) (length key)))
3221 (goto-char reg-start) 3227 (goto-char reg-start)
3222 (ispell-print-if-debug 3228 (ispell-print-if-debug
3223 (format "ispell-region: First skip: %s at (pos,line,column): (%s,%s,%s).\n" 3229 "ispell-region: First skip: %s at (pos,line,column): (%s,%s,%s).\n"
3224 key 3230 key
3225 (save-excursion (goto-char skip-region-start) (point)) 3231 (save-excursion (goto-char skip-region-start) (point))
3226 (line-number-at-pos skip-region-start) 3232 (line-number-at-pos skip-region-start)
3227 (save-excursion (goto-char skip-region-start) (current-column)))))) 3233 (save-excursion (goto-char skip-region-start) (current-column)))))
3228 (ispell-print-if-debug 3234 (ispell-print-if-debug
3229 (format 3235 "ispell-region: Continue spell-checking with %s and %s dictionary...\n"
3230 "ispell-region: Continue spell-checking with %s and %s dictionary...\n" 3236 program-basename dictionary)
3231 program-basename dictionary))
3232 (set-marker rstart reg-start) 3237 (set-marker rstart reg-start)
3233 (set-marker ispell-region-end reg-end) 3238 (set-marker ispell-region-end reg-end)
3234 (while (and (not ispell-quit) 3239 (while (and (not ispell-quit)
@@ -3263,11 +3268,11 @@ amount for last line processed."
3263 (- (point) (length key))) 3268 (- (point) (length key)))
3264 (goto-char rstart) 3269 (goto-char rstart)
3265 (ispell-print-if-debug 3270 (ispell-print-if-debug
3266 (format "ispell-region: Next skip: %s at (pos,line,column): (%s,%s,%s).\n" 3271 "ispell-region: Next skip: %s at (pos,line,column): (%s,%s,%s).\n"
3267 key 3272 key
3268 (save-excursion (goto-char skip-region-start) (point)) 3273 (save-excursion (goto-char skip-region-start) (point))
3269 (line-number-at-pos skip-region-start) 3274 (line-number-at-pos skip-region-start)
3270 (save-excursion (goto-char skip-region-start) (current-column))))) 3275 (save-excursion (goto-char skip-region-start) (current-column))))
3271 (set-marker skip-region-start nil)))) 3276 (set-marker skip-region-start nil))))
3272 (setq reg-end (max (point) 3277 (setq reg-end (max (point)
3273 (if (marker-position skip-region-start) 3278 (if (marker-position skip-region-start)
@@ -3286,9 +3291,8 @@ amount for last line processed."
3286 (string (ispell-get-line 3291 (string (ispell-get-line
3287 ispell-start ispell-end add-comment))) 3292 ispell-start ispell-end add-comment)))
3288 (ispell-print-if-debug 3293 (ispell-print-if-debug
3289 (format 3294 "ispell-region: string pos (%s->%s), eol: %s, [in-comment]: [%s], [add-comment]: [%s], [string]: [%s]\n"
3290 "ispell-region: string pos (%s->%s), eol: %s, [in-comment]: [%s], [add-comment]: [%s], [string]: [%s]\n" 3295 ispell-start ispell-end (point-at-eol) in-comment add-comment string)
3291 ispell-start ispell-end (point-at-eol) in-comment add-comment string))
3292 (if add-comment ; account for comment chars added 3296 (if add-comment ; account for comment chars added
3293 (setq ispell-start (- ispell-start (length add-comment)) 3297 (setq ispell-start (- ispell-start (length add-comment))
3294 add-comment nil)) 3298 add-comment nil))
@@ -3575,118 +3579,118 @@ Returns the sum SHIFT due to changes in word replacements."
3575 (let* ((ispell-pipe-word (car poss)) 3579 (let* ((ispell-pipe-word (car poss))
3576 (actual-point (marker-position word-start)) 3580 (actual-point (marker-position word-start))
3577 (actual-line (line-number-at-pos actual-point)) 3581 (actual-line (line-number-at-pos actual-point))
3578 (actual-column (save-excursion (goto-char actual-point) (current-column)))) 3582 (actual-column (save-excursion (goto-char actual-point)
3583 (current-column))))
3579 (ispell-print-if-debug 3584 (ispell-print-if-debug
3580 (concat 3585 "ispell-process-line: Ispell misalignment error:
3581 "ispell-process-line: Ispell misalignment error:\n" 3586 [Word from ispell pipe]: [%s], actual (point,line,column): (%s,%s,%s)\n"
3582 (format " [Word from ispell pipe]: [%s], actual (point,line,column): (%s,%s,%s)\n" 3587 ispell-pipe-word actual-point actual-line actual-column)
3583 ispell-pipe-word actual-point actual-line actual-column))) 3588 (error (concat "Ispell misalignment: word "
3584 (error (concat "Ispell misalignment: word " 3589 "`%s' point %d; probably incompatible versions")
3585 "`%s' point %d; probably incompatible versions") 3590 ispell-pipe-word actual-point)))
3586 ispell-pipe-word actual-point))) 3591 ;; ispell-cmd-loop can go recursive & change buffer
3587 ;; ispell-cmd-loop can go recursive & change buffer 3592 (if ispell-keep-choices-win
3588 (if ispell-keep-choices-win 3593 (setq replace (ispell-command-loop
3589 (setq replace (ispell-command-loop 3594 (car (cdr (cdr poss)))
3590 (car (cdr (cdr poss))) 3595 (car (cdr (cdr (cdr poss))))
3591 (car (cdr (cdr (cdr poss)))) 3596 (car poss) (marker-position word-start)
3592 (car poss) (marker-position word-start) 3597 (+ word-len (marker-position word-start))))
3593 (+ word-len (marker-position word-start)))) 3598 (save-window-excursion
3594 (save-window-excursion 3599 (setq replace (ispell-command-loop
3595 (setq replace (ispell-command-loop 3600 (car (cdr (cdr poss)))
3596 (car (cdr (cdr poss))) 3601 (car (cdr (cdr (cdr poss))))
3597 (car (cdr (cdr (cdr poss)))) 3602 (car poss) (marker-position word-start)
3598 (car poss) (marker-position word-start) 3603 (+ word-len (marker-position word-start))))))
3599 (+ word-len (marker-position word-start)))))) 3604
3600 3605 (goto-char word-start)
3601 (goto-char word-start) 3606 ;; Recheck when query replace edit changes misspelled word.
3602 ;; Recheck when query replace edit changes misspelled word. 3607 ;; Error in tex mode when a potential math mode change exists.
3603 ;; Error in tex mode when a potential math mode change exists. 3608 (if (and replace (listp replace) (= 2 (length replace)))
3604 (if (and replace (listp replace) (= 2 (length replace))) 3609 (if (and (eq ispell-parser 'tex)
3605 (if (and (eq ispell-parser 'tex) 3610 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$"
3606 (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$" 3611 (regexp-quote string)))
3607 (regexp-quote string))) 3612 (error
3608 (error 3613 "Don't start query replace on a line with math characters"
3609 "Don't start query replace on a line with math characters" 3614 )
3610 ) 3615 (set-marker line-end (point))
3611 (set-marker line-end (point)) 3616 (setq ispell-filter nil
3612 (setq ispell-filter nil 3617 recheck-region t)))
3613 recheck-region t))) 3618
3614 3619 ;; Insert correction if needed.
3615 ;; insert correction if needed 3620 (cond
3616 (cond 3621 ((or (null replace)
3617 ((or (null replace) 3622 (equal 0 replace)) ; ACCEPT/INSERT
3618 (equal 0 replace)) ; ACCEPT/INSERT 3623 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD
3619 (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD 3624 (ispell-add-per-file-word-list (car poss)))
3620 (ispell-add-per-file-word-list (car poss))) 3625 ;; Do not recheck accepted word on this line.
3621 ;; do not recheck accepted word on this line 3626 (setq accept-list (cons (car poss) accept-list)))
3622 (setq accept-list (cons (car poss) accept-list))) 3627 (t ; Replacement word selected or entered.
3623 (t ; replacement word selected or entered 3628 (delete-region (point) (+ word-len (point)))
3624 (delete-region (point) (+ word-len (point))) 3629 (if (not (listp replace))
3625 (if (not (listp replace)) 3630 (progn
3626 (progn 3631 (insert replace) ; Insert dictionary word.
3627 (insert replace) ; insert dictionary word 3632 (ispell-send-replacement (car poss) replace)
3628 (ispell-send-replacement (car poss) replace) 3633 (setq accept-list (cons replace accept-list)))
3629 (setq accept-list (cons replace accept-list))) 3634 (let ((replace-word (car replace)))
3630 (let ((replace-word (car replace))) 3635 ;; Recheck hand entered replacement word.
3631 ;; Recheck hand entered replacement word 3636 (insert replace-word)
3632 (insert replace-word) 3637 (ispell-send-replacement (car poss) replace-word)
3633 (ispell-send-replacement (car poss) replace-word) 3638 (if (car (cdr replace))
3634 (if (car (cdr replace)) 3639 (save-window-excursion
3635 (save-window-excursion 3640 (delete-other-windows) ; to correctly show help.
3636 (delete-other-windows) ; to correctly show help. 3641 ;; Assume case-replace &
3637 ;; Assume case-replace & 3642 ;; case-fold-search correct?
3638 ;; case-fold-search correct? 3643 (query-replace (car poss) (car replace) t)))
3639 (query-replace (car poss) (car replace) t))) 3644 (goto-char word-start)
3640 (goto-char word-start) 3645 ;; Do not recheck if already accepted.
3641 ;; do not recheck if already accepted 3646 (if (member replace-word accept-list)
3642 (if (member replace-word accept-list) 3647 (setq accept-list (cons replace-word accept-list)
3643 (setq accept-list (cons replace-word accept-list) 3648 replace replace-word)
3644 replace replace-word) 3649 (let ((region-end (copy-marker ispell-region-end)))
3645 (let ((region-end (copy-marker ispell-region-end))) 3650 (setq recheck-region ispell-filter
3646 (setq recheck-region ispell-filter 3651 ispell-filter nil ; Save filter.
3647 ispell-filter nil ; save filter 3652 shift 0 ; Already accounted.
3648 shift 0 ; already accounted 3653 shift (ispell-region
3649 shift (ispell-region 3654 word-start
3650 word-start 3655 (+ word-start (length replace-word))
3651 (+ word-start (length replace-word)) 3656 t shift))
3652 t shift)) 3657 (if (null shift) ; Quitting check.
3653 (if (null shift) ; quitting check. 3658 (setq shift 0))
3654 (setq shift 0)) 3659 (set-marker ispell-region-end region-end)
3655 (set-marker ispell-region-end region-end) 3660 (set-marker region-end nil)
3656 (set-marker region-end nil) 3661 (setq ispell-filter recheck-region
3657 (setq ispell-filter recheck-region 3662 recheck-region nil
3658 recheck-region nil 3663 replace replace-word)))))
3659 replace replace-word))))) 3664
3660 3665 (setq shift (+ shift (- (length replace) word-len)))
3661 (setq shift (+ shift (- (length replace) word-len))) 3666
3662 3667 ;; Move line-start across word...
3663 ;; Move line-start across word... 3668 ;; new shift function does this now...
3664 ;; new shift function does this now... 3669 ;;(set-marker line-start (+ line-start
3665 ;;(set-marker line-start (+ line-start 3670 ;; (- (length replace)
3666 ;; (- (length replace) 3671 ;; (length (car poss)))))
3667 ;; (length (car poss))))) 3672 ))
3668 )) 3673 (if (not ispell-quit)
3669 (if (not ispell-quit)
3670 ;; FIXME: remove redundancy with identical code above. 3674 ;; FIXME: remove redundancy with identical code above.
3671 (let (message-log-max) 3675 (let (message-log-max)
3672 (message 3676 (message
3673 "Continuing spelling check using %s with %s dictionary..." 3677 "Continuing spelling check using %s with %s dictionary..."
3674 (file-name-nondirectory ispell-program-name) 3678 (file-name-nondirectory ispell-program-name)
3675 (or ispell-current-dictionary "default")))) 3679 (or ispell-current-dictionary "default"))))
3676 (sit-for 0) 3680 (sit-for 0)
3677 (setq ispell-start (marker-position line-start) 3681 (setq ispell-start (marker-position line-start)
3678 ispell-end (marker-position line-end)) 3682 ispell-end (marker-position line-end))
3679 ;; Adjust markers when end of region lost from highlighting. 3683 ;; Adjust markers when end of region lost from highlighting.
3680 (if (and (not recheck-region) 3684 (if (and (not recheck-region)
3681 (< ispell-end (+ word-start word-len))) 3685 (< ispell-end (+ word-start word-len)))
3682 (setq ispell-end (+ word-start word-len))) 3686 (setq ispell-end (+ word-start word-len)))
3683 (if (= word-start ispell-region-end) 3687 (if (= word-start ispell-region-end)
3684 (set-marker ispell-region-end (+ word-start word-len))) 3688 (set-marker ispell-region-end (+ word-start word-len)))
3685 ;; going out of scope - unneeded 3689 ;; Going out of scope - unneeded.
3686 (set-marker line-start nil) 3690 (set-marker line-start nil)
3687 (set-marker word-start nil) 3691 (set-marker word-start nil)
3688 (set-marker line-end nil))) 3692 (set-marker line-end nil)))
3689 ;; finished with misspelling! 3693 ;; Finished with misspelling!
3690 (setq ispell-filter (cdr ispell-filter))) 3694 (setq ispell-filter (cdr ispell-filter)))
3691 shift)) 3695 shift))
3692 3696
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index fb0dc84b0e1..33dfa277330 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -312,8 +312,8 @@ Any terminating `>' or `/' is not matched.")
312 312
313(defconst sgml-syntax-propertize-function 313(defconst sgml-syntax-propertize-function
314 (syntax-propertize-rules 314 (syntax-propertize-rules
315 ;; Use the `b' style of comments to avoid interference with the -- ... -- 315 ;; Use the `b' style of comments to avoid interference with the -- ... --
316 ;; comments recognized when `sgml-specials' includes ?-. 316 ;; comments recognized when `sgml-specials' includes ?-.
317 ;; FIXME: beware of <!--> blabla <!--> !! 317 ;; FIXME: beware of <!--> blabla <!--> !!
318 ("\\(<\\)!--" (1 "< b")) 318 ("\\(<\\)!--" (1 "< b"))
319 ("--[ \t\n]*\\(>\\)" (1 "> b")) 319 ("--[ \t\n]*\\(>\\)" (1 "> b"))
@@ -322,7 +322,7 @@ Any terminating `>' or `/' is not matched.")
322 ;; going to change, so as not to need to flush the data we just computed. 322 ;; going to change, so as not to need to flush the data we just computed.
323 ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0)))) 323 ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0))))
324 (goto-char (match-end 0))) 324 (goto-char (match-end 0)))
325 ".")))) 325 (string-to-syntax ".")))))
326 "Syntactic keywords for `sgml-mode'.") 326 "Syntactic keywords for `sgml-mode'.")
327 327
328;; internal 328;; internal
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 5880d4f4545..0152f29326b 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -18,13 +18,16 @@ AC_DEFUN([gl_EXTERN_INLINE],
18 _GL_INLINE_HEADER_END contains useful stuff to put 18 _GL_INLINE_HEADER_END contains useful stuff to put
19 in the same include file, after uses of _GL_INLINE. 19 in the same include file, after uses of _GL_INLINE.
20 20
21 Suppress extern inline with HP-UX cc, as it appears to be broken; see
22 <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
23
21 Suppress the use of extern inline on Apple's platforms, 24 Suppress the use of extern inline on Apple's platforms,
22 as Libc-825.25 (2012-09-19) is incompatible with it; see 25 as Libc-825.25 (2012-09-19) is incompatible with it; see
23 <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>. 26 <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
24 Perhaps Apple will fix this some day. */ 27 Perhaps Apple will fix this some day. */
25#if ((__GNUC__ \ 28#if ((__GNUC__ \
26 ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ 29 ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
27 : 199901L <= __STDC_VERSION__) \ 30 : 199901L <= __STDC_VERSION__ && !defined __HP_cc) \
28 && !defined __APPLE__) 31 && !defined __APPLE__)
29# define _GL_INLINE inline 32# define _GL_INLINE inline
30# define _GL_EXTERN_INLINE extern inline 33# define _GL_EXTERN_INLINE extern inline
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index a7987120c50..6c3012d827f 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -271,6 +271,7 @@ AC_DEFUN([gl_INIT],
271 gl_FUNC_PUTENV 271 gl_FUNC_PUTENV
272 if test $REPLACE_PUTENV = 1; then 272 if test $REPLACE_PUTENV = 1; then
273 AC_LIBOBJ([putenv]) 273 AC_LIBOBJ([putenv])
274 gl_PREREQ_PUTENV
274 fi 275 fi
275 gl_STDLIB_MODULE_INDICATOR([putenv]) 276 gl_STDLIB_MODULE_INDICATOR([putenv])
276 gl_FUNC_READLINK 277 gl_FUNC_READLINK
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 9de53527a73..03ed4f97dbe 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -48,3 +48,9 @@ AC_DEFUN([gl_FUNC_PUTENV],
48 ;; 48 ;;
49 esac 49 esac
50]) 50])
51
52# Prerequisites of lib/putenv.c.
53AC_DEFUN([gl_PREREQ_PUTENV],
54[
55 AC_CHECK_FUNCS([_putenv])
56])
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-05 10:26:01 +0000