Now on revision 111911. ------------------------------------------------------------ revno: 111911 committer: Bastien Guerry branch nick: trunk timestamp: Sat 2013-03-02 08:19:10 +0100 message: Fix typo in comment (bug#13851). Thanks to Reuben Thomas for reporting this. diff: === modified file 'lisp/emacs-lisp/nadvice.el' --- lisp/emacs-lisp/nadvice.el 2013-01-15 06:05:22 +0000 +++ lisp/emacs-lisp/nadvice.el 2013-03-02 07:19:10 +0000 @@ -23,7 +23,7 @@ ;; This package lets you add behavior (which we call "piece of advice") to ;; existing functions, like the old `advice.el' package, but with much fewer -;; bells ans whistles. It comes in 2 parts: +;; bells and whistles. It comes in 2 parts: ;; ;; - The first part lets you add/remove functions, similarly to ;; add/remove-hook, from any "place" (i.e. as accepted by `setf') that ------------------------------------------------------------ revno: 111910 committer: Michael Albinus branch nick: trunk timestamp: Fri 2013-03-01 22:14:59 +0100 message: * tramp.texi (External methods): Explain user name and host name specification for "adb". diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-03-01 08:16:13 +0000 +++ doc/misc/ChangeLog 2013-03-01 21:14:59 +0000 @@ -2,7 +2,8 @@ * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1" and "plink2" entries. "plink2" is obsolete for a long time. - (External methods): Remove "scp1" and "scp2" entries. + (External methods): Remove "scp1" and "scp2" entries. Explain + user name and host name specification for "adb". 2013-02-28 Michael Albinus === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2013-03-01 08:16:13 +0000 +++ doc/misc/tramp.texi 2013-03-01 21:14:59 +0000 @@ -1005,6 +1005,18 @@ found via the @code{$PATH} environment variable, the variable @var{tramp-adb-program} must point to its absolute path. +Usually, the @command{adb} method does not need any user name. It +runs under the permissions of the @command{adbd} process on the +Android device. If a user name is specified, @value{tramp} applies an +@command{su} on the device. This does not work with all Android +devices, especially with nonrooted ones. In that case, an error +message is displayed. + +If there is exactly one Android device connected to the local machine, +a host name is not needed. The shortest @value{tramp} name to be used +is @file{@trampfn{adb, , ,}} therefore. Otherwise, one could find +potential host names with the shell command @command{adb devices}. + @end table ------------------------------------------------------------ revno: 111909 committer: Michael Albinus branch nick: trunk timestamp: Fri 2013-03-01 22:12:26 +0100 message: * net/tramp-adb.el (tramp-adb-prompt): Extend regexp. (tramp-adb-handle-process-file): Remove superfluous setting. (tramp-adb-command-exit-status): Handle case that COMMAND is nil. (tramp-adb-barf-unless-okay): Use `tramp-adb-command-exit-status'. (tramp-adb-maybe-open-connection): Apply "su" if user is defined. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-01 17:46:57 +0000 +++ lisp/ChangeLog 2013-03-01 21:12:26 +0000 @@ -1,3 +1,11 @@ +2013-03-01 Michael Albinus + + * net/tramp-adb.el (tramp-adb-prompt): Extend regexp. + (tramp-adb-handle-process-file): Remove superfluous setting. + (tramp-adb-command-exit-status): Handle case that COMMAND is nil. + (tramp-adb-barf-unless-okay): Use `tramp-adb-command-exit-status'. + (tramp-adb-maybe-open-connection): Apply "su" if user is defined. + 2013-03-01 Stefan Monnier * textmodes/ispell.el: Fix nitpicks and byte-compiler warnings. === modified file 'lisp/net/tramp-adb.el' --- lisp/net/tramp-adb.el 2013-02-28 19:33:03 +0000 +++ lisp/net/tramp-adb.el 2013-03-01 21:12:26 +0000 @@ -49,7 +49,7 @@ "*When this method name is used, forward all calls to Android Debug Bridge.") (defcustom tramp-adb-prompt - "^\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" + "^\\(?:[[:digit:]]*|?\\)?\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" "Regexp used as prompt in almquist shell." :type 'string :version "24.4" @@ -775,13 +775,11 @@ ;; directory. (condition-case nil (progn - (setq ret 0 - ret - (tramp-adb-barf-unless-okay - v (format "(cd %s; %s)" - (tramp-shell-quote-argument localname) - command) - "")) + (setq ret 0) + (tramp-adb-barf-unless-okay + v (format "(cd %s; %s)" + (tramp-shell-quote-argument localname) command) + "") ;; We should show the output anyway. (when outbuf (with-current-buffer outbuf @@ -1011,34 +1009,31 @@ (while (re-search-forward "\r+$" nil t) (replace-match "" nil nil))))) -(defun tramp-adb-barf-unless-okay (vec command fmt &rest args) - "Run COMMAND, check exit status, throw error if exit status not okay. -FMT and ARGS are passed to `error'." - (tramp-adb-send-command vec (format "%s; echo tramp_exit_status $?" command)) - (with-current-buffer (tramp-get-connection-buffer vec) - (goto-char (point-max)) - (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) - (tramp-error - vec 'file-error "Couldn't find exit status of `%s'" command)) - (skip-chars-forward "^ ") - (unless (zerop (read (current-buffer))) - (apply 'tramp-error vec 'file-error fmt args)) - (let (buffer-read-only) - (delete-region (match-beginning 0) (point-max))))) - (defun tramp-adb-command-exit-status (vec command) "Run COMMAND and return its exit status. Sends `echo $?' along with the COMMAND for checking the exit status. If COMMAND is nil, just sends `echo $?'. Returns the exit status found." - (tramp-adb-send-command vec (format "%s; echo tramp_exit_status $?" command)) + (tramp-adb-send-command + vec (if command + (format "%s; echo tramp_exit_status $?" command) + "echo tramp_exit_status $?")) (with-current-buffer (tramp-get-connection-buffer vec) (goto-char (point-max)) (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) (tramp-error vec 'file-error "Couldn't find exit status of `%s'" command)) (skip-chars-forward "^ ") - (read (current-buffer)))) + (prog1 + (read (current-buffer)) + (let (buffer-read-only) + (delete-region (match-beginning 0) (point-max)))))) + +(defun tramp-adb-barf-unless-okay (vec command fmt &rest args) + "Run COMMAND, check exit status, throw error if exit status not okay. +FMT and ARGS are passed to `error'." + (unless (zerop (tramp-adb-command-exit-status vec command)) + (apply 'tramp-error vec 'file-error fmt args))) (defun tramp-adb-wait-for-output (proc &optional timeout) "Wait for output from remote command." @@ -1077,6 +1072,7 @@ (let* ((buf (tramp-get-connection-buffer vec)) (p (get-buffer-process buf)) (host (tramp-file-name-host vec)) + (user (tramp-file-name-user vec)) (devices (mapcar 'cadr (tramp-adb-parse-device-names nil)))) (unless (and p (processp p) (memq (process-status p) '(run open))) @@ -1132,6 +1128,13 @@ old-getprop new-getprop) (tramp-adb-maybe-open-connection vec))) + ;; Change user if indicated. + (when user + (tramp-adb-send-command vec (format "su %s" user)) + (unless (zerop (tramp-adb-command-exit-status vec nil)) + (delete-process p) + (tramp-error vec 'file-error "Cannot switch to user %s" user))) + ;; Set "remote-path" connection property. This is needed ;; for eshell. (tramp-adb-send-command vec "echo \\\"$PATH\\\"") ------------------------------------------------------------ revno: 111908 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2013-03-01 12:46:57 -0500 message: * lisp/textmodes/ispell.el: Fix nitpicks and byte-compiler warnings. (ispell-print-if-debug): Build `format' in. Avoid end-of-buffer. (ispell-parse-hunspell-affix-file): Avoid beginning-of-buffer. Use dict-key rather than dict-name for the error message. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-01 17:27:57 +0000 +++ lisp/ChangeLog 2013-03-01 17:46:57 +0000 @@ -1,3 +1,10 @@ +2013-03-01 Stefan Monnier + + * textmodes/ispell.el: Fix nitpicks and byte-compiler warnings. + (ispell-print-if-debug): Build `format' in. Avoid end-of-buffer. + (ispell-parse-hunspell-affix-file): Avoid beginning-of-buffer. + Use dict-key rather than dict-name for the error message. + 2013-03-01 Thierry Volpiatto * net/net-utils.el (net-utils-run-simple): Don't display-buffer === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2013-03-01 17:13:04 +0000 +++ lisp/textmodes/ispell.el 2013-03-01 17:46:57 +0000 @@ -749,8 +749,10 @@ set as casechars and otherchars in the LANGUAGE.aff file \(e.g., english.aff\). aspell and hunspell don't have this limitation.") -(defvar ispell-really-aspell nil) ; Non-nil if we can use aspell extensions. -(defvar ispell-really-hunspell nil) ; Non-nil if we can use hunspell extensions. +(defvar ispell-really-aspell nil + "Non-nil if we can use aspell extensions.") +(defvar ispell-really-hunspell nil + "Non-nil if we can use hunspell extensions.") (defvar ispell-encoding8-command nil "Command line option prefix to select encoding if supported, nil otherwise. If setting the encoding is supported by spellchecker and is selectable from @@ -860,7 +862,7 @@ (if (string-match "\\`aspell" speller) "-v" "-vv")))) (goto-char (point-min)) (if interactivep - ;; report version information of ispell and ispell.el + ;; Report version information of ispell and ispell.el (progn (end-of-line) (setq result (concat (buffer-substring-no-properties (point-min) @@ -955,12 +957,12 @@ (erase-buffer))) ispell-debug-buffer)) -(defsubst ispell-print-if-debug (string) - "Print STRING to `ispell-debug-buffer' buffer if enabled." +(defsubst ispell-print-if-debug (format &rest args) + "Print message to `ispell-debug-buffer' buffer if enabled." (if (boundp 'ispell-debug-buffer) (with-current-buffer ispell-debug-buffer - (end-of-buffer) - (insert string)))) + (goto-char (point-max)) + (insert (apply #'format format args))))) ;; The preparation of the menu bar menu must be autoloaded @@ -1133,13 +1135,13 @@ ;; Make ispell.el work better with hunspell. (defvar ispell-hunspell-dict-paths-alist nil - "Alist of parsed hunspell dicts and associated affix files. + "Alist of parsed hunspell dicts and associated affix files. Will be used to parse corresponding .aff file and create associated parameters to be inserted into `ispell-hunspell-dictionary-alist'. Internal use.") (defvar ispell-hunspell-dictionary-alist nil - "Alist of parsed hunspell dicts and associated parameters. + "Alist of parsed hunspell dicts and associated parameters. This alist will initially contain names of found dicts. Associated parameters will be added when dict is used for the first time. Internal use.") @@ -1150,7 +1152,8 @@ all uninitialized dicts using that affix file." (if (cadr (assoc dict ispell-dictionary-alist)) (message "ispell-hfde: Non void entry for %s. Skipping.\n" dict) - (let ((dict-alias (cadr (assoc dict ispell-hunspell-dictionary-equivs-alist))) + (let ((dict-alias + (cadr (assoc dict ispell-hunspell-dictionary-equivs-alist))) (use-for-dicts (list dict)) (dict-args-cdr (cdr (ispell-parse-hunspell-affix-file dict))) newlist) @@ -1162,10 +1165,12 @@ (member dict-alias dict-equiv-alist-entry)) (dolist ( tmp-dict (list dict-equiv-key dict-equiv-value)) (if (cadr (assoc tmp-dict ispell-dictionary-alist)) - (ispell-print-if-debug (format "ispell-hfde: %s already expanded. Skipping.\n" tmp-dict)) + (ispell-print-if-debug + "ispell-hfde: %s already expanded. Skipping.\n" tmp-dict) (add-to-list 'use-for-dicts tmp-dict)))))) - (ispell-print-if-debug (format "ispell-hfde: Filling %s entry. Use for %s.\n" dict use-for-dicts)) - ;; The final loop + (ispell-print-if-debug + "ispell-hfde: Filling %s entry. Use for %s.\n" dict use-for-dicts) + ;; The final loop. (dolist (entry ispell-dictionary-alist) (if (member (car entry) use-for-dicts) (add-to-list 'newlist @@ -1178,39 +1183,41 @@ Return a list in `ispell-dictionary-alist' format." (let ((affix-file (cadr (assoc dict-key ispell-hunspell-dict-paths-alist)))) (unless affix-file - (error "ispell-phaf: No matching entry for %s.\n" dict-name)) - (if (file-exists-p affix-file) - (let ((dict-name (file-name-sans-extension (file-name-nondirectory affix-file))) - otherchars-string otherchars-list) - (with-temp-buffer - (insert-file-contents affix-file) - (setq otherchars-string - (save-excursion - (beginning-of-buffer) - (if (search-forward-regexp "^WORDCHARS +" nil t ) - (buffer-substring (point) - (progn (end-of-line) (point)))))) - ;; Remove trailing whitespace and extra stuff. Make list if non-nil. - (setq otherchars-list - (if otherchars-string - (split-string - (if (string-match " +.*$" otherchars-string) - (replace-match "" nil nil otherchars-string) - otherchars-string) - "" t))) + (error "ispell-phaf: No matching entry for %s.\n" dict-key)) + (if (not (file-exists-p affix-file)) + (error "ispell-phaf: File \"%s\" not found.\n" affix-file)) + (let ((dict-name (file-name-sans-extension + (file-name-nondirectory affix-file))) + otherchars-string otherchars-list) + (with-temp-buffer + (insert-file-contents affix-file) + (setq otherchars-string + (save-excursion + (goto-char (point-min)) + (if (search-forward-regexp "^WORDCHARS +" nil t ) + (buffer-substring (point) + (progn (end-of-line) (point)))))) + ;; Remove trailing whitespace and extra stuff. Make list if + ;; non-nil. + (setq otherchars-list + (if otherchars-string + (split-string + (if (string-match " +.*$" otherchars-string) + (replace-match "" nil nil otherchars-string) + otherchars-string) + "" t))) - ;; Fill dict entry - (list dict-key - "[[:alpha:]]" - "[^[:alpha:]]" - (if otherchars-list - (regexp-opt otherchars-list) - "") - t ;; many-otherchars-p: We can't tell, set to t - (list "-d" dict-name) - nil ;; extended-char-mode: not supported by hunspell - 'utf-8))) - (error "ispell-phaf: File \"%s\" not found.\n" affix-file)))) + ;; Fill dict entry + (list dict-key + "[[:alpha:]]" + "[^[:alpha:]]" + (if otherchars-list + (regexp-opt otherchars-list) + "") + t ; many-otherchars-p: We can't tell, set to t. + (list "-d" dict-name) + nil ; extended-char-mode: not supported by hunspell! + 'utf-8))))) (defun ispell-find-hunspell-dictionaries () "Look for installed hunspell dictionaries. @@ -1247,19 +1254,19 @@ ;; Entry has an associated .aff file and no previous value. (let ((affix-file (expand-file-name affix-file))) (ispell-print-if-debug - (format "++ ispell-fhd: dict-entry:%s name:%s basename:%s affix-file:%s\n" - dict full-name basename affix-file)) + "++ ispell-fhd: dict-entry:%s name:%s basename:%s affix-file:%s\n" + dict full-name basename affix-file) (add-to-list 'ispell-hunspell-dict-paths-alist (list basename affix-file))) (ispell-print-if-debug - (format "-- ispell-fhd: Skipping entry: %s\n" dict)))))) + "-- ispell-fhd: Skipping entry: %s\n" dict))))) ;; Remove entry from aliases alist if explicit dict was found. (let (newlist) (dolist (dict ispell-hunspell-dictionary-equivs-alist) (if (assoc (car dict) ispell-hunspell-dict-paths-alist) (ispell-print-if-debug - (format "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n" - (car dict))) + "-- ispell-fhd: Excluding %s alias. Standalone dict found.\n" + (car dict)) (add-to-list 'newlist dict))) (setq ispell-hunspell-dictionary-equivs-alist newlist)) ;; Add known hunspell aliases @@ -1274,9 +1281,10 @@ (if (and (assoc dict-equiv-value ispell-hunspell-dict-paths-alist) (not (assoc dict-equiv-key ispell-hunspell-dict-paths-alist)) (not (member dict-equiv-key exclude-aliases))) - (let ((affix-file (cadr (assoc dict-equiv-value ispell-hunspell-dict-paths-alist)))) - (ispell-print-if-debug (format "++ ispell-fhd: Adding alias %s -> %s.\n" - dict-equiv-key affix-file)) + (let ((affix-file (cadr (assoc dict-equiv-value + ispell-hunspell-dict-paths-alist)))) + (ispell-print-if-debug "++ ispell-fhd: Adding alias %s -> %s.\n" + dict-equiv-key affix-file) (add-to-list 'ispell-hunspell-dict-paths-alist (list dict-equiv-key affix-file)))))) @@ -3207,29 +3215,25 @@ (query-fcc t) in-comment key) (ispell-print-if-debug - (concat - (format - "ispell-region: (ispell-skip-region-list):\n%s\n" - (ispell-skip-region-list)) - (format - "ispell-region: (ispell-begin-skip-region-regexp):\n%s\n" - (ispell-begin-skip-region-regexp)) - "ispell-region: Search for first region to skip after (ispell-begin-skip-region-regexp)\n")) + "ispell-region: (ispell-skip-region-list):\n%s +ispell-region: (ispell-begin-skip-region-regexp):\n%s +ispell-region: Search for first region to skip after (ispell-begin-skip-region-regexp)\n" + (ispell-skip-region-list) + (ispell-begin-skip-region-regexp)) (if (re-search-forward (ispell-begin-skip-region-regexp) reg-end t) (progn (setq key (match-string-no-properties 0)) (set-marker skip-region-start (- (point) (length key))) (goto-char reg-start) (ispell-print-if-debug - (format "ispell-region: First skip: %s at (pos,line,column): (%s,%s,%s).\n" - key - (save-excursion (goto-char skip-region-start) (point)) - (line-number-at-pos skip-region-start) - (save-excursion (goto-char skip-region-start) (current-column)))))) + "ispell-region: First skip: %s at (pos,line,column): (%s,%s,%s).\n" + key + (save-excursion (goto-char skip-region-start) (point)) + (line-number-at-pos skip-region-start) + (save-excursion (goto-char skip-region-start) (current-column))))) (ispell-print-if-debug - (format - "ispell-region: Continue spell-checking with %s and %s dictionary...\n" - program-basename dictionary)) + "ispell-region: Continue spell-checking with %s and %s dictionary...\n" + program-basename dictionary) (set-marker rstart reg-start) (set-marker ispell-region-end reg-end) (while (and (not ispell-quit) @@ -3264,11 +3268,11 @@ (- (point) (length key))) (goto-char rstart) (ispell-print-if-debug - (format "ispell-region: Next skip: %s at (pos,line,column): (%s,%s,%s).\n" - key - (save-excursion (goto-char skip-region-start) (point)) - (line-number-at-pos skip-region-start) - (save-excursion (goto-char skip-region-start) (current-column))))) + "ispell-region: Next skip: %s at (pos,line,column): (%s,%s,%s).\n" + key + (save-excursion (goto-char skip-region-start) (point)) + (line-number-at-pos skip-region-start) + (save-excursion (goto-char skip-region-start) (current-column)))) (set-marker skip-region-start nil)))) (setq reg-end (max (point) (if (marker-position skip-region-start) @@ -3287,9 +3291,8 @@ (string (ispell-get-line ispell-start ispell-end add-comment))) (ispell-print-if-debug - (format - "ispell-region: string pos (%s->%s), eol: %s, [in-comment]: [%s], [add-comment]: [%s], [string]: [%s]\n" - ispell-start ispell-end (point-at-eol) in-comment add-comment string)) + "ispell-region: string pos (%s->%s), eol: %s, [in-comment]: [%s], [add-comment]: [%s], [string]: [%s]\n" + ispell-start ispell-end (point-at-eol) in-comment add-comment string) (if add-comment ; account for comment chars added (setq ispell-start (- ispell-start (length add-comment)) add-comment nil)) @@ -3576,118 +3579,118 @@ (let* ((ispell-pipe-word (car poss)) (actual-point (marker-position word-start)) (actual-line (line-number-at-pos actual-point)) - (actual-column (save-excursion (goto-char actual-point) (current-column)))) + (actual-column (save-excursion (goto-char actual-point) + (current-column)))) (ispell-print-if-debug - (concat - "ispell-process-line: Ispell misalignment error:\n" - (format " [Word from ispell pipe]: [%s], actual (point,line,column): (%s,%s,%s)\n" - ispell-pipe-word actual-point actual-line actual-column))) - (error (concat "Ispell misalignment: word " - "`%s' point %d; probably incompatible versions") - ispell-pipe-word actual-point))) - ;; ispell-cmd-loop can go recursive & change buffer - (if ispell-keep-choices-win - (setq replace (ispell-command-loop - (car (cdr (cdr poss))) - (car (cdr (cdr (cdr poss)))) - (car poss) (marker-position word-start) - (+ word-len (marker-position word-start)))) - (save-window-excursion - (setq replace (ispell-command-loop - (car (cdr (cdr poss))) - (car (cdr (cdr (cdr poss)))) - (car poss) (marker-position word-start) - (+ word-len (marker-position word-start)))))) - - (goto-char word-start) - ;; Recheck when query replace edit changes misspelled word. - ;; Error in tex mode when a potential math mode change exists. - (if (and replace (listp replace) (= 2 (length replace))) - (if (and (eq ispell-parser 'tex) - (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$" - (regexp-quote string))) - (error - "Don't start query replace on a line with math characters" - ) - (set-marker line-end (point)) - (setq ispell-filter nil - recheck-region t))) - - ;; insert correction if needed - (cond - ((or (null replace) - (equal 0 replace)) ; ACCEPT/INSERT - (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD - (ispell-add-per-file-word-list (car poss))) - ;; do not recheck accepted word on this line - (setq accept-list (cons (car poss) accept-list))) - (t ; replacement word selected or entered - (delete-region (point) (+ word-len (point))) - (if (not (listp replace)) - (progn - (insert replace) ; insert dictionary word - (ispell-send-replacement (car poss) replace) - (setq accept-list (cons replace accept-list))) - (let ((replace-word (car replace))) - ;; Recheck hand entered replacement word - (insert replace-word) - (ispell-send-replacement (car poss) replace-word) - (if (car (cdr replace)) - (save-window-excursion - (delete-other-windows) ; to correctly show help. - ;; Assume case-replace & - ;; case-fold-search correct? - (query-replace (car poss) (car replace) t))) - (goto-char word-start) - ;; do not recheck if already accepted - (if (member replace-word accept-list) - (setq accept-list (cons replace-word accept-list) - replace replace-word) - (let ((region-end (copy-marker ispell-region-end))) - (setq recheck-region ispell-filter - ispell-filter nil ; save filter - shift 0 ; already accounted - shift (ispell-region - word-start - (+ word-start (length replace-word)) - t shift)) - (if (null shift) ; quitting check. - (setq shift 0)) - (set-marker ispell-region-end region-end) - (set-marker region-end nil) - (setq ispell-filter recheck-region - recheck-region nil - replace replace-word))))) - - (setq shift (+ shift (- (length replace) word-len))) - - ;; Move line-start across word... - ;; new shift function does this now... - ;;(set-marker line-start (+ line-start - ;; (- (length replace) - ;; (length (car poss))))) - )) - (if (not ispell-quit) + "ispell-process-line: Ispell misalignment error: + [Word from ispell pipe]: [%s], actual (point,line,column): (%s,%s,%s)\n" + ispell-pipe-word actual-point actual-line actual-column) + (error (concat "Ispell misalignment: word " + "`%s' point %d; probably incompatible versions") + ispell-pipe-word actual-point))) + ;; ispell-cmd-loop can go recursive & change buffer + (if ispell-keep-choices-win + (setq replace (ispell-command-loop + (car (cdr (cdr poss))) + (car (cdr (cdr (cdr poss)))) + (car poss) (marker-position word-start) + (+ word-len (marker-position word-start)))) + (save-window-excursion + (setq replace (ispell-command-loop + (car (cdr (cdr poss))) + (car (cdr (cdr (cdr poss)))) + (car poss) (marker-position word-start) + (+ word-len (marker-position word-start)))))) + + (goto-char word-start) + ;; Recheck when query replace edit changes misspelled word. + ;; Error in tex mode when a potential math mode change exists. + (if (and replace (listp replace) (= 2 (length replace))) + (if (and (eq ispell-parser 'tex) + (string-match "[\\\\][]()[]\\|\\\\begin\\|\\$" + (regexp-quote string))) + (error + "Don't start query replace on a line with math characters" + ) + (set-marker line-end (point)) + (setq ispell-filter nil + recheck-region t))) + + ;; Insert correction if needed. + (cond + ((or (null replace) + (equal 0 replace)) ; ACCEPT/INSERT + (if (equal 0 replace) ; BUFFER-LOCAL DICT ADD + (ispell-add-per-file-word-list (car poss))) + ;; Do not recheck accepted word on this line. + (setq accept-list (cons (car poss) accept-list))) + (t ; Replacement word selected or entered. + (delete-region (point) (+ word-len (point))) + (if (not (listp replace)) + (progn + (insert replace) ; Insert dictionary word. + (ispell-send-replacement (car poss) replace) + (setq accept-list (cons replace accept-list))) + (let ((replace-word (car replace))) + ;; Recheck hand entered replacement word. + (insert replace-word) + (ispell-send-replacement (car poss) replace-word) + (if (car (cdr replace)) + (save-window-excursion + (delete-other-windows) ; to correctly show help. + ;; Assume case-replace & + ;; case-fold-search correct? + (query-replace (car poss) (car replace) t))) + (goto-char word-start) + ;; Do not recheck if already accepted. + (if (member replace-word accept-list) + (setq accept-list (cons replace-word accept-list) + replace replace-word) + (let ((region-end (copy-marker ispell-region-end))) + (setq recheck-region ispell-filter + ispell-filter nil ; Save filter. + shift 0 ; Already accounted. + shift (ispell-region + word-start + (+ word-start (length replace-word)) + t shift)) + (if (null shift) ; Quitting check. + (setq shift 0)) + (set-marker ispell-region-end region-end) + (set-marker region-end nil) + (setq ispell-filter recheck-region + recheck-region nil + replace replace-word))))) + + (setq shift (+ shift (- (length replace) word-len))) + + ;; Move line-start across word... + ;; new shift function does this now... + ;;(set-marker line-start (+ line-start + ;; (- (length replace) + ;; (length (car poss))))) + )) + (if (not ispell-quit) ;; FIXME: remove redundancy with identical code above. - (let (message-log-max) - (message + (let (message-log-max) + (message "Continuing spelling check using %s with %s dictionary..." (file-name-nondirectory ispell-program-name) (or ispell-current-dictionary "default")))) - (sit-for 0) - (setq ispell-start (marker-position line-start) - ispell-end (marker-position line-end)) - ;; Adjust markers when end of region lost from highlighting. - (if (and (not recheck-region) + (sit-for 0) + (setq ispell-start (marker-position line-start) + ispell-end (marker-position line-end)) + ;; Adjust markers when end of region lost from highlighting. + (if (and (not recheck-region) (< ispell-end (+ word-start word-len))) - (setq ispell-end (+ word-start word-len))) - (if (= word-start ispell-region-end) - (set-marker ispell-region-end (+ word-start word-len))) - ;; going out of scope - unneeded - (set-marker line-start nil) - (set-marker word-start nil) - (set-marker line-end nil))) - ;; finished with misspelling! + (setq ispell-end (+ word-start word-len))) + (if (= word-start ispell-region-end) + (set-marker ispell-region-end (+ word-start word-len))) + ;; Going out of scope - unneeded. + (set-marker line-start nil) + (set-marker word-start nil) + (set-marker line-end nil))) + ;; Finished with misspelling! (setq ispell-filter (cdr ispell-filter))) shift)) ------------------------------------------------------------ revno: 111907 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13831 author: Thierry Volpiatto committer: Stefan Monnier branch nick: trunk timestamp: Fri 2013-03-01 12:27:57 -0500 message: * lisp/net/net-utils.el (net-utils-run-simple): Don't display-buffer when reverting. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-01 17:13:04 +0000 +++ lisp/ChangeLog 2013-03-01 17:27:57 +0000 @@ -1,6 +1,11 @@ +2013-03-01 Thierry Volpiatto + + * net/net-utils.el (net-utils-run-simple): Don't display-buffer + when reverting (bug#13831). + 2013-03-01 Agustín Martín Domingo - * textmodes/ispell.el (ispell-find-hunspell-dictionaries): + * textmodes/ispell.el (ispell-find-hunspell-dictionaries): Always expand affix-file before storing to protect against changed `default-directory'. (ispell-print-if-debug): Make sure message is printed at the end === modified file 'lisp/net/net-utils.el' --- lisp/net/net-utils.el 2013-02-28 14:51:03 +0000 +++ lisp/net/net-utils.el 2013-03-01 17:27:57 +0000 @@ -358,7 +358,7 @@ ;; Todo: This data could be saved in a bookmark. (defvar net-utils--revert-cmd nil) -(defun net-utils-run-simple (buffer program-name args) +(defun net-utils-run-simple (buffer program-name args &optional nodisplay) "Run a network utility for diagnostic output only." (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer) (let ((proc (get-buffer-process (current-buffer)))) @@ -369,13 +369,14 @@ (erase-buffer)) (net-utils-mode) (setq-local net-utils--revert-cmd - `(net-utils-run-simple ,(current-buffer) ,program-name ,args)) + `(net-utils-run-simple ,(current-buffer) + ,program-name ,args nodisplay)) (set-process-filter (apply 'start-process program-name (current-buffer) program-name args) 'net-utils-remove-ctrl-m-filter) (goto-char (point-min)) - (display-buffer (current-buffer)))) + (unless nodisplay (display-buffer (current-buffer))))) (defun net-utils--revert-function (&optional ignore-auto noconfirm) (message "Reverting `%s'..." (buffer-name)) ------------------------------------------------------------ revno: 111906 committer: Agustin Martin branch nick: trunk timestamp: Fri 2013-03-01 18:13:04 +0100 message: textmodes/ispell.el: Expand hunspell affix-file paths. Improve debug messages printing. * textmodes/ispell.el (ispell-find-hunspell-dictionaries): Always expand affix-file before storing to protect against changed `default-directory'. (ispell-print-if-debug): Make sure message is printed at the end of the debug buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-01 08:13:53 +0000 +++ lisp/ChangeLog 2013-03-01 17:13:04 +0000 @@ -1,3 +1,11 @@ +2013-03-01 Agustín Martín Domingo + + * textmodes/ispell.el (ispell-find-hunspell-dictionaries): + Always expand affix-file before storing to protect against changed + `default-directory'. + (ispell-print-if-debug): Make sure message is printed at the end + of the debug buffer. + 2013-03-01 Michael Albinus * net/tramp.el (tramp-obsolete-methods): New defconst. === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2013-02-28 19:01:34 +0000 +++ lisp/textmodes/ispell.el 2013-03-01 17:13:04 +0000 @@ -959,6 +959,7 @@ "Print STRING to `ispell-debug-buffer' buffer if enabled." (if (boundp 'ispell-debug-buffer) (with-current-buffer ispell-debug-buffer + (end-of-buffer) (insert string)))) @@ -1244,7 +1245,7 @@ (if (and (not (assoc basename ispell-hunspell-dict-paths-alist)) (file-exists-p affix-file)) ;; Entry has an associated .aff file and no previous value. - (progn + (let ((affix-file (expand-file-name affix-file))) (ispell-print-if-debug (format "++ ispell-fhd: dict-entry:%s name:%s basename:%s affix-file:%s\n" dict full-name basename affix-file)) ------------------------------------------------------------ revno: 111905 committer: Paul Eggert branch nick: trunk timestamp: Fri 2013-03-01 07:16:43 -0800 message: Merge from gnulib. 2013-02-21 putenv: port better to native Windows 2013-02-18 extern-inline: avoid compilation error with HP-UX cc 2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv diff: === modified file 'ChangeLog' --- ChangeLog 2013-02-28 03:19:51 +0000 +++ ChangeLog 2013-03-01 15:16:43 +0000 @@ -1,3 +1,10 @@ +2013-03-01 Paul Eggert + + Merge from gnulib, incorporating: + 2013-02-21 putenv: port better to native Windows + 2013-02-18 extern-inline: avoid compilation error with HP-UX cc + 2013-02-14 putenv: fix heap corruption with mixed putenv/_putenv + 2013-02-28 Ken Brown * configure.ac (HAVE_DATA_START): Fix test. (Bug#13818) === modified file 'lib/putenv.c' --- lib/putenv.c 2013-01-02 16:37:04 +0000 +++ lib/putenv.c 2013-03-01 15:16:43 +0000 @@ -34,6 +34,11 @@ #include #include +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# define WIN32_LEAN_AND_MEAN +# include +#endif + #if _LIBC # if HAVE_GNU_LD # define environ __environ @@ -67,6 +72,21 @@ len = strlen (name); +#if HAVE__PUTENV + { + int putenv_result, putenv_errno; + char *name_ = malloc (len + 2); + memcpy (name_, name, len); + name_[len] = '='; + name_[len + 1] = 0; + putenv_result = _putenv (name_); + putenv_errno = errno; + free (name_); + __set_errno (putenv_errno); + return putenv_result; + } +#else + LOCK; ep = environ; @@ -87,6 +107,7 @@ UNLOCK; return 0; +#endif } @@ -95,9 +116,8 @@ int putenv (char *string) { - const char *const name_end = strchr (string, '='); - register size_t size; - register char **ep; + const char *name_end = strchr (string, '='); + char **ep; if (name_end == NULL) { @@ -105,30 +125,68 @@ return _unsetenv (string); } - size = 0; - for (ep = environ; *ep != NULL; ++ep) - if (!strncmp (*ep, string, name_end - string) && - (*ep)[name_end - string] == '=') +#if HAVE__PUTENV + /* Rely on _putenv to allocate the new environment. If other + parts of the application use _putenv, the !HAVE__PUTENV code + would fight over who owns the environ vector, causing a crash. */ + if (name_end[1]) + return _putenv (string); + else + { + /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ") + to allocate the environ vector and then replace the new + entry with "NAME=". */ + int putenv_result, putenv_errno; + char *name_x = malloc (name_end - string + sizeof "= "); + if (!name_x) + return -1; + memcpy (name_x, string, name_end - string + 1); + name_x[name_end - string + 1] = ' '; + name_x[name_end - string + 2] = 0; + putenv_result = _putenv (name_x); + putenv_errno = errno; + for (ep = environ; *ep; ep++) + if (strcmp (*ep, name_x) == 0) + { + *ep = string; + break; + } +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + if (putenv_result == 0) + { + /* _putenv propagated "NAME= " into the subprocess environment; + fix that by calling SetEnvironmentVariable directly. */ + name_x[name_end - string] = 0; + putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1; + putenv_errno = ENOMEM; /* ENOMEM is the only way to fail. */ + } +# endif + free (name_x); + __set_errno (putenv_errno); + return putenv_result; + } +#else + for (ep = environ; *ep; ep++) + if (strncmp (*ep, string, name_end - string) == 0 + && (*ep)[name_end - string] == '=') break; - else - ++size; - if (*ep == NULL) + if (*ep) + *ep = string; + else { static char **last_environ = NULL; - char **new_environ = (char **) malloc ((size + 2) * sizeof (char *)); - if (new_environ == NULL) + size_t size = ep - environ; + char **new_environ = malloc ((size + 2) * sizeof *new_environ); + if (! new_environ) return -1; - (void) memcpy ((void *) new_environ, (void *) environ, - size * sizeof (char *)); - new_environ[size] = (char *) string; - new_environ[size + 1] = NULL; + new_environ[0] = string; + memcpy (new_environ + 1, environ, (size + 1) * sizeof *new_environ); free (last_environ); last_environ = new_environ; environ = new_environ; } - else - *ep = string; +#endif return 0; } === modified file 'm4/extern-inline.m4' --- m4/extern-inline.m4 2013-01-02 16:37:04 +0000 +++ m4/extern-inline.m4 2013-03-01 15:16:43 +0000 @@ -18,13 +18,16 @@ _GL_INLINE_HEADER_END contains useful stuff to put in the same include file, after uses of _GL_INLINE. + Suppress extern inline with HP-UX cc, as it appears to be broken; see + . + Suppress the use of extern inline on Apple's platforms, as Libc-825.25 (2012-09-19) is incompatible with it; see . Perhaps Apple will fix this some day. */ #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : 199901L <= __STDC_VERSION__) \ + : 199901L <= __STDC_VERSION__ && !defined __HP_cc) \ && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2013-02-11 23:37:18 +0000 +++ m4/gnulib-comp.m4 2013-03-01 15:16:43 +0000 @@ -271,6 +271,7 @@ gl_FUNC_PUTENV if test $REPLACE_PUTENV = 1; then AC_LIBOBJ([putenv]) + gl_PREREQ_PUTENV fi gl_STDLIB_MODULE_INDICATOR([putenv]) gl_FUNC_READLINK === modified file 'm4/putenv.m4' --- m4/putenv.m4 2013-01-02 16:37:04 +0000 +++ m4/putenv.m4 2013-03-01 15:16:43 +0000 @@ -48,3 +48,9 @@ ;; esac ]) + +# Prerequisites of lib/putenv.c. +AC_DEFUN([gl_PREREQ_PUTENV], +[ + AC_CHECK_FUNCS([_putenv]) +]) ------------------------------------------------------------ revno: 111904 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-03-01 06:17:35 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2013-02-07 08:31:21 +0000 +++ lisp/ldefs-boot.el 2013-03-01 11:17:35 +0000 @@ -895,7 +895,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (20743 44982 104196 0)) +;;;;;; "net/ange-ftp.el" (20763 30266 231060 0)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -1152,8 +1152,8 @@ ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20759 +;;;;;; 33211 414988 0)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1245,8 +1245,8 @@ ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20777 +;;;;;; 63161 848428 0)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1480,7 +1480,7 @@ ;;;*** ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20755 36154 171386 0)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1656,7 +1656,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (20746 21181 635406 0)) +;;;;;; "autorevert" "autorevert.el" (20767 27320 533690 0)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -2713,7 +2713,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20709 26818 907104 0)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20780 39352 990623 0)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2872,8 +2872,8 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc -;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20721 -;;;;;; 17977 14204 0)) +;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20759 +;;;;;; 33211 414988 0)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2980,8 +2980,8 @@ ;;;*** -;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20725 -;;;;;; 15032 264919 0)) +;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (20762 +;;;;;; 9398 526093 0)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3090,7 +3090,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (20739 47925 957834 0)) +;;;;;; (20755 36154 171386 0)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -4125,8 +4125,8 @@ ;;;*** -;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20709 26818 -;;;;;; 907104 0)) +;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20772 12071 +;;;;;; 425443 833000)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3") @@ -4174,8 +4174,8 @@ ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (20774 +;;;;;; 53405 584723 417000)) ;;; Generated autoloads from cmuscheme.el (autoload 'run-scheme "cmuscheme" "\ @@ -4355,27 +4355,24 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20723 -;;;;;; 59703 12265 0)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20763 +;;;;;; 30266 231060 0)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ -List of hook functions run by `compilation-mode' (see `run-mode-hooks').") +List of hook functions run by `compilation-mode'.") (custom-autoload 'compilation-mode-hook "compile" t) (defvar compilation-start-hook nil "\ -List of hook functions run by `compilation-start' on the compilation process. -\(See `run-hook-with-args'). -If you use \"omake -P\" and do not want \\[save-buffers-kill-terminal] to ask whether you want -the compilation to be killed, you can use this hook: - (add-hook 'compilation-start-hook - (lambda (process) (set-process-query-on-exit-flag process nil)) nil t)") +Hook run after starting a new compilation process. +The hook is run with one argument, the new process.") (custom-autoload 'compilation-start-hook "compile" t) (defvar compilation-window-height nil "\ -Number of lines in a compilation window. If nil, use Emacs default.") +Number of lines in a compilation window. +If nil, use Emacs default.") (custom-autoload 'compilation-window-height "compile" t) @@ -4792,7 +4789,7 @@ ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20709 26818 907104 +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20763 30266 231060 ;;;;;; 0)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) @@ -4832,7 +4829,7 @@ The user types the keyword immediately followed by a space, which causes the construct to be expanded, and the point is positioned where -she is most likely to want to be. eg. when the user types a space +she is most likely to want to be. E.g., when the user types a space following \"if\" the following appears in the buffer: if () { or if () } { } and the cursor is between the parentheses. The user can then type some boolean expression within the parens. Having done that, @@ -4992,7 +4989,7 @@ ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20762 9398 526093 0)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -5144,7 +5141,7 @@ ;;;;;; customize-mode customize customize-push-and-save customize-save-variable ;;;;;; customize-set-variable customize-set-value custom-menu-sort-alphabetically ;;;;;; custom-buffer-sort-alphabetically custom-browse-sort-alphabetically) -;;;;;; "cus-edit" "cus-edit.el" (20709 26818 907104 0)) +;;;;;; "cus-edit" "cus-edit.el" (20762 9398 526093 0)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5647,8 +5644,8 @@ ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20763 +;;;;;; 30266 231060 0)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5971,7 +5968,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (20709 26818 907104 0)) +;;;;;; "descr-text.el" (20764 51137 83502 0)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6274,7 +6271,7 @@ ;;;### (autoloads (diff-buffer-with-file diff-latest-backup-file ;;;;;; diff-backup diff diff-command diff-switches) "diff" "vc/diff.el" -;;;;;; (20721 17977 14204 0)) +;;;;;; (20760 54070 584283 0)) ;;; Generated autoloads from vc/diff.el (defvar diff-switches (purecopy "-c") "\ @@ -6323,7 +6320,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20784 36406 653593 0)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6366,9 +6363,9 @@ ;;;*** -;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (20731 53823 -;;;;;; 676680 0)) +;;;### (autoloads (dired-hide-details-mode dired-mode dired-noselect +;;;;;; dired-other-frame dired-other-window dired dired-listing-switches) +;;;;;; "dired" "dired.el" (20784 36406 653593 0)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6486,6 +6483,11 @@ \(fn &optional DIRNAME SWITCHES)" nil nil) (put 'dired-find-alternate-file 'disabled t) +(autoload 'dired-hide-details-mode "dired" "\ +Hide details in `dired-mode'. + +\(fn &optional ARG)" t nil) + ;;;*** ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el" @@ -6723,8 +6725,8 @@ ;;;*** ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe -;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20737 -;;;;;; 6202 609148 0)) +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20783 +;;;;;; 15545 430927 0)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6811,7 +6813,7 @@ ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (20709 26818 907104 0)) +;;;;;; "emacs-lisp/easy-mmode.el" (20780 39352 990623 0)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -6865,13 +6867,14 @@ :require SYM Same as in `defcustom'. :variable PLACE The location to use instead of the variable MODE to store the state of the mode. This can be simply a different - named variable, or more generally anything that can be used - with the CL macro `setf'. PLACE can also be of the form - (GET . SET), where GET is an expression that returns the - current state, and SET is a function that takes one argument, - the new state, and sets it. If you specify a :variable, - this function does not define a MODE variable (nor any of - the terms used in :variable). + named variable, or a generalized variable. + PLACE can also be of the form (GET . SET), where GET is + an expression that returns the current state, and SET is + a function that takes one argument, the new state, and + sets it. If you specify a :variable, this function does + not define a MODE variable (nor any of the terms used + in :variable). + :after-hook A single lisp form which is evaluated after the mode hooks have been run. It should not be quoted. @@ -6907,6 +6910,10 @@ prevent problems with derived modes, that is, major modes that call another major mode in their body. +When a major mode is initialized, MODE is actually turned on just +after running the major mode's hook. However, MODE is not turned +on if the hook has explicitly disabled it. + \(fn GLOBAL-MODE MODE TURN-ON &rest KEYS)" nil t) (put 'define-globalized-minor-mode 'doc-string-elt '2) @@ -7571,8 +7578,8 @@ ;;;*** -;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20709 26818 -;;;;;; 907104 0)) +;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20748 62911 +;;;;;; 684442 0)) ;;; Generated autoloads from cedet/ede.el (defvar global-ede-mode nil "\ @@ -7929,7 +7936,7 @@ ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "vc/ediff-util.el" (20709 26818 907104 0)) +;;;;;; "ediff-util" "vc/ediff-util.el" (20777 63161 848428 0)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -8017,7 +8024,7 @@ ;;;*** ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20762 9398 526093 0)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8054,7 +8061,7 @@ ;;;*** ;;;### (autoloads (customize-object) "eieio-custom" "emacs-lisp/eieio-custom.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20771 24374 643644 0)) ;;; Generated autoloads from emacs-lisp/eieio-custom.el (autoload 'customize-object "eieio-custom" "\ @@ -8067,7 +8074,7 @@ ;;;### (autoloads (eieio-describe-generic eieio-describe-constructor ;;;;;; eieio-describe-class eieio-browse) "eieio-opt" "emacs-lisp/eieio-opt.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20771 24374 643644 0)) ;;; Generated autoloads from emacs-lisp/eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ @@ -8101,7 +8108,7 @@ ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (20709 26818 907104 0)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (20770 3512 176098 0)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8336,7 +8343,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20759 33211 414988 0)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8452,8 +8459,8 @@ ;;;;;; epa-sign-region epa-verify-cleartext-in-region epa-verify-region ;;;;;; epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file ;;;;;; epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys -;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20709 -;;;;;; 26818 907104 0)) +;;;;;; epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20762 +;;;;;; 9398 526093 0)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8860,7 +8867,7 @@ ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (20719 62656 824443 0)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (20759 33211 414988 0)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -9055,7 +9062,7 @@ ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20763 30266 231060 0)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9298,7 +9305,7 @@ ;;;### (autoloads (ert-describe-test ert-run-tests-interactively ;;;;;; ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest) -;;;;;; "ert" "emacs-lisp/ert.el" (20719 62656 824443 0)) +;;;;;; "ert" "emacs-lisp/ert.el" (20751 39094 700824 0)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -10392,8 +10399,8 @@ ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20566 63671 -;;;;;; 243798 0)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20759 33211 +;;;;;; 414988 0)) ;;; Generated autoloads from mail/feedmail.el (autoload 'feedmail-send-it "feedmail" "\ @@ -10448,7 +10455,7 @@ ;;;### (autoloads (ffap-bindings ffap-guess-file-name-at-point dired-at-point ;;;;;; ffap-at-mouse ffap-menu find-file-at-point ffap-next) "ffap" -;;;;;; "ffap.el" (20721 17977 14204 0)) +;;;;;; "ffap.el" (20752 26669 524456 0)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10674,7 +10681,7 @@ ;;;*** ;;;### (autoloads (find-grep-dired find-name-dired find-dired) "find-dired" -;;;;;; "find-dired.el" (20709 26818 907104 0)) +;;;;;; "find-dired.el" (20763 30266 231060 0)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -11357,8 +11364,8 @@ ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (20709 26818 -;;;;;; 907104 0)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (20765 36517 +;;;;;; 595445 191000)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11782,7 +11789,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (20719 62656 824443 0)) +;;;;;; (20763 30266 231060 0)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -12002,7 +12009,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (20709 26818 907104 0)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (20763 30266 231060 0)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12317,7 +12324,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20709 26818 907104 +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20779 18487 859617 ;;;;;; 0)) ;;; Generated autoloads from gnus/gnus-registry.el @@ -12374,7 +12381,7 @@ ;;;*** ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" -;;;;;; (20721 17977 14204 0)) +;;;;;; (20763 30266 231060 0)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12385,7 +12392,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (20734 30007 218637 0)) +;;;;;; (20763 30266 231060 0)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12468,8 +12475,8 @@ ;;;*** ;;;### (autoloads (goto-address-prog-mode goto-address-mode goto-address -;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (20709 -;;;;;; 26818 907104 0)) +;;;;;; goto-address-at-point) "goto-addr" "net/goto-addr.el" (20766 +;;;;;; 6456 368550 0)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias 'goto-address-at-mouse 'goto-address-at-point "22.1") @@ -12529,8 +12536,8 @@ ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20709 26818 -;;;;;; 907104 0)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20762 9398 +;;;;;; 526093 0)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12563,7 +12570,7 @@ (custom-autoload 'grep-setup-hook "grep" t) -(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)) "\ +(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)) "\ Regexp used to match grep hits. See `compilation-error-regexp-alist'.") (defvar grep-program (purecopy "grep") "\ @@ -13122,7 +13129,7 @@ ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories ;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 ;;;;;; find-lisp-object-file-name help-C-file-name describe-function) -;;;;;; "help-fns" "help-fns.el" (20709 26818 907104 0)) +;;;;;; "help-fns" "help-fns.el" (20764 51137 83502 0)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13335,7 +13342,7 @@ ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (20709 26818 907104 0)) +;;;;;; "hexl.el" (20763 30266 231060 0)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13378,8 +13385,8 @@ 000000c0: 7265 6769 6f6e 2e0a region.. Movement is as simple as movement in a normal Emacs text buffer. Most -cursor movement bindings are the same (ie. Use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line] -to move the cursor left, right, down, and up). +cursor movement bindings are the same: use \\[hexl-backward-char], \\[hexl-forward-char], \\[hexl-next-line], and \\[hexl-previous-line] +to move the cursor left, right, down, and up. Advanced cursor movement commands (ala \\[hexl-beginning-of-line], \\[hexl-end-of-line], \\[hexl-beginning-of-buffer], and \\[hexl-end-of-buffer]) are also supported. @@ -14070,7 +14077,7 @@ ;;;*** ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer) -;;;;;; "htmlfontify" "htmlfontify.el" (20709 26818 907104 0)) +;;;;;; "htmlfontify" "htmlfontify.el" (20774 51822 616889 64000)) ;;; Generated autoloads from htmlfontify.el (autoload 'htmlfontify-buffer "htmlfontify" "\ @@ -14286,8 +14293,8 @@ ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20710 -;;;;;; 47669 981323 0)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (20766 +;;;;;; 59066 666084 0)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14511,8 +14518,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20709 -;;;;;; 26818 907104 0)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20766 +;;;;;; 59066 666084 0)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14804,7 +14811,7 @@ ;;;;;; create-image image-type-auto-detected-p image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20772 45239 494620 0)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15004,7 +15011,7 @@ ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (20709 26818 907104 0)) +;;;;;; "image-dired" "image-dired.el" (20768 48184 78670 0)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -15069,7 +15076,7 @@ (defalias 'image-dired 'image-dired-show-all-from-dir) -(defalias 'tumme 'image-dired-show-all-from-dir) +(define-obsolete-function-alias 'tumme 'image-dired "24.4") (autoload 'image-dired-tag-files "image-dired" "\ Tag marked file(s) in dired. With prefix ARG, tag file at point. @@ -15205,8 +15212,8 @@ ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (20731 53823 676680 -;;;;;; 0)) +;;;;;; image-mode) "image-mode" "image-mode.el" (20774 51931 214714 +;;;;;; 829000)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15251,7 +15258,7 @@ ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (20747 42040 139863 +;;;;;; imenu-sort-function) "imenu" "imenu.el" (20784 36406 653593 ;;;;;; 0)) ;;; Generated autoloads from imenu.el @@ -15423,7 +15430,7 @@ ;;;*** ;;;### (autoloads (inferior-lisp) "inf-lisp" "progmodes/inf-lisp.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20774 53405 644725 888000)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15445,7 +15452,7 @@ ;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node ;;;;;; Info-mode info-finder info-apropos Info-index Info-directory ;;;;;; Info-on-current-buffer info-standalone info-emacs-bug info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (20721 17977 14204 +;;;;;; info info-other-window) "info" "info.el" (20774 566 676067 ;;;;;; 0)) ;;; Generated autoloads from info.el @@ -15659,7 +15666,7 @@ ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20771 24374 643644 0)) ;;; Generated autoloads from info-look.el (autoload 'info-lookup-reset "info-look" "\ @@ -15791,8 +15798,7 @@ ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold -;;;;;; Info-tagify) "informat" "informat.el" (20709 26818 907104 -;;;;;; 0)) +;;;;;; Info-tagify) "informat" "informat.el" (20774 566 676067 0)) ;;; Generated autoloads from informat.el (autoload 'Info-tagify "informat" "\ @@ -15991,7 +15997,7 @@ ;;;;;; ispell-buffer ispell-comments-and-strings ispell-region ispell-change-dictionary ;;;;;; ispell-kill-ispell ispell-help ispell-pdict-save ispell-word ;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" -;;;;;; (20734 30007 218637 0)) +;;;;;; (20784 36406 653593 0)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16224,8 +16230,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20766 +;;;;;; 59066 666084 0)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -16332,7 +16338,7 @@ ;;;*** ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (20709 26818 907104 0)) +;;;;;; "jka-compr.el" (20759 33211 414988 0)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16355,7 +16361,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20730 32949 736763 +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20763 30266 231060 ;;;;;; 0)) ;;; Generated autoloads from progmodes/js.el @@ -16839,7 +16845,7 @@ ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (20709 26818 907104 0)) +;;;;;; "locate" "locate.el" (20763 30266 231060 0)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches (purecopy "-al") "\ @@ -17419,7 +17425,7 @@ ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (20746 21181 635406 +;;;;;; "make-mode" "progmodes/make-mode.el" (20748 62911 684442 ;;;;;; 0)) ;;; Generated autoloads from progmodes/make-mode.el @@ -17550,7 +17556,7 @@ ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (20719 62656 824443 0)) +;;;;;; (20762 9398 526093 0)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -18106,7 +18112,7 @@ ;;;*** ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" -;;;;;; "minibuf-eldef.el" (20709 26818 907104 0)) +;;;;;; "minibuf-eldef.el" (20760 54070 584283 0)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ @@ -18383,7 +18389,7 @@ ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (20709 26818 907104 0)) +;;;;;; "mml2015" "gnus/mml2015.el" (20780 39352 990623 0)) ;;; Generated autoloads from gnus/mml2015.el (autoload 'mml2015-decrypt "mml2015" "\ @@ -18938,8 +18944,8 @@ ;;;### (autoloads (network-connection network-connection-to-service ;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host ;;;;;; nslookup nslookup-host ping traceroute route arp netstat -;;;;;; iwconfig ifconfig) "net-utils" "net/net-utils.el" (20709 -;;;;;; 26818 907104 0)) +;;;;;; iwconfig ifconfig) "net-utils" "net/net-utils.el" (20784 +;;;;;; 36406 653593 0)) ;;; Generated autoloads from net/net-utils.el (autoload 'ifconfig "net-utils" "\ @@ -19047,7 +19053,7 @@ ;;;*** ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20770 3512 176098 0)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19160,7 +19166,7 @@ ;;;*** ;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20762 9398 526093 0)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19324,8 +19330,8 @@ ;;;*** -;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (nxml-mode) "nxml-mode" "nxml/nxml-mode.el" (20763 +;;;;;; 30266 231060 0)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19559,7 +19565,7 @@ ;;;;;; org-run-like-in-org-mode turn-on-orgstruct++ turn-on-orgstruct ;;;;;; orgstruct-mode org-global-cycle org-cycle org-mode org-clock-persistence-insinuate ;;;;;; turn-on-orgtbl org-version org-babel-do-load-languages) "org" -;;;;;; "org/org.el" (20723 59703 12265 0)) +;;;;;; "org/org.el" (20783 15545 430927 0)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19785,7 +19791,7 @@ ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda ;;;;;; org-agenda org-toggle-sticky-agenda) "org-agenda" "org/org-agenda.el" -;;;;;; (20723 59703 12265 0)) +;;;;;; (20783 15545 430927 0)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -20034,7 +20040,7 @@ and :timestamp entries. See the docstring of `org-diary' for details and examples. -If an entry as a APPT_WARNTIME property, its value will be used +If an entry has a APPT_WARNTIME property, its value will be used to override `appt-message-warning-time'. \(fn &optional REFRESH FILTER &rest ARGS)" t nil) @@ -20162,7 +20168,7 @@ ;;;*** ;;;### (autoloads (org-git-version org-release) "org-version" "org/org-version.el" -;;;;;; (20723 59703 12265 0)) +;;;;;; (20783 15545 430927 0)) ;;; Generated autoloads from org/org-version.el (autoload 'org-release "org-version" "\ @@ -20183,7 +20189,7 @@ ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20773 35190 350513 0)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20247,7 +20253,7 @@ ;;;### (autoloads (list-packages describe-package package-initialize ;;;;;; package-refresh-contents package-install-file package-install-from-buffer ;;;;;; package-install package-enable-at-startup) "package" "emacs-lisp/package.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20764 51137 83502 0)) ;;; Generated autoloads from emacs-lisp/package.el (defvar package-enable-at-startup t "\ @@ -21649,7 +21655,7 @@ ;;;### (autoloads (profiler-find-profile-other-frame profiler-find-profile-other-window ;;;;;; profiler-find-profile profiler-start) "profiler" "profiler.el" -;;;;;; (20738 27061 124069 0)) +;;;;;; (20752 27211 244736 501000)) ;;; Generated autoloads from profiler.el (autoload 'profiler-start "profiler" "\ @@ -21725,8 +21731,8 @@ ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20777 +;;;;;; 63161 848428 0)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload 'ps-mode "ps-mode" "\ @@ -21975,7 +21981,7 @@ ;;;*** ;;;### (autoloads (python-mode run-python) "python" "progmodes/python.el" -;;;;;; (20746 21181 635406 0)) +;;;;;; (20774 51843 230245 0)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) @@ -22265,8 +22271,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20709 -;;;;;; 26818 907104 0)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20764 +;;;;;; 51137 83502 0)) ;;; Generated autoloads from net/quickurl.el (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 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (20709 26818 907104 0)) +;;;;;; "net/rcirc.el" (20770 3512 176098 0)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22594,8 +22600,8 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20709 26818 -;;;;;; 907104 0)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20777 63161 +;;;;;; 848428 0)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -22779,7 +22785,7 @@ ;;;### (autoloads (remember-diary-extract-entries remember-clipboard ;;;;;; remember-other-frame remember) "remember" "textmodes/remember.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20748 62911 684442 0)) ;;; Generated autoloads from textmodes/remember.el (autoload 'remember "remember" "\ @@ -22798,8 +22804,7 @@ (autoload 'remember-clipboard "remember" "\ Remember the contents of the current clipboard. -Most useful for remembering things from Netscape or other X Windows -application. +Most useful for remembering things from other applications. \(fn)" t nil) @@ -22994,8 +22999,8 @@ ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-user-mail-address-regexp rmail-movemail-variant-p rmail-spool-directory -;;;;;; rmail-file-name) "rmail" "mail/rmail.el" (20723 59924 854722 -;;;;;; 212000)) +;;;;;; rmail-file-name) "rmail" "mail/rmail.el" (20762 9398 526093 +;;;;;; 0)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23446,7 +23451,7 @@ ;;;*** ;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el" -;;;;;; (20742 24117 440849 0)) +;;;;;; (20764 51137 83502 0)) ;;; Generated autoloads from progmodes/ruby-mode.el (autoload 'ruby-mode "ruby-mode" "\ @@ -23941,7 +23946,7 @@ ;;;*** ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic" -;;;;;; "cedet/semantic.el" (20745 310 425822 0)) +;;;;;; "cedet/semantic.el" (20748 62911 684442 0)) ;;; Generated autoloads from cedet/semantic.el (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\ @@ -24309,8 +24314,8 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (20721 -;;;;;; 17977 14204 0)) +;;;;;; server-force-delete server-start) "server" "server.el" (20763 +;;;;;; 30266 231060 0)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24396,7 +24401,7 @@ ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (20721 17977 14204 0)) +;;;;;; (20784 36406 653593 0)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -24664,8 +24669,8 @@ ;;;*** -;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20768 +;;;;;; 48184 78670 0)) ;;; Generated autoloads from gnus/shr.el (autoload 'shr-insert-document "shr" "\ @@ -24720,8 +24725,8 @@ ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (20777 +;;;;;; 63161 848428 0)) ;;; Generated autoloads from progmodes/simula.el (autoload 'simula-mode "simula" "\ @@ -26796,7 +26801,7 @@ ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (20709 26818 907104 0)) +;;;;;; "progmodes/tcl.el" (20774 53405 704746 172000)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -26956,7 +26961,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20774 53405 754743 8000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27413,7 +27418,7 @@ ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (20709 26818 907104 0)) +;;;;;; "thingatpt" "thingatpt.el" (20752 26669 524456 0)) ;;; Generated autoloads from thingatpt.el (autoload 'forward-thing "thingatpt" "\ @@ -27959,7 +27964,7 @@ ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (20709 26818 907104 0)) +;;;;;; "tmm.el" (20764 51137 83502 0)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -28245,7 +28250,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (20746 21181 635406 0)) +;;;;;; "net/tramp.el" (20784 36406 653593 0)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28388,8 +28393,8 @@ ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20760 +;;;;;; 54070 584283 0)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28425,7 +28430,7 @@ ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (20709 26818 907104 0)) +;;;;;; "textmodes/two-column.el" (20763 30266 231060 0)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28836,7 +28841,7 @@ ;;;*** ;;;### (autoloads (url-cache-extract url-is-cached url-store-in-cache) -;;;;;; "url-cache" "url/url-cache.el" (20709 26818 907104 0)) +;;;;;; "url-cache" "url/url-cache.el" (20751 39094 700824 0)) ;;; Generated autoloads from url/url-cache.el (autoload 'url-store-in-cache "url-cache" "\ @@ -28989,8 +28994,8 @@ ;;;*** -;;;### (autoloads nil "url-http" "url/url-http.el" (20709 26818 907104 -;;;;;; 0)) +;;;### (autoloads nil "url-http" "url/url-http.el" (20766 59628 334727 +;;;;;; 618000)) ;;; Generated autoloads from url/url-http.el (autoload 'url-default-expander "url-expand") @@ -29491,8 +29496,8 @@ ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers ;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff ;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20713 -;;;;;; 23861 754849 0)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20752 +;;;;;; 26669 524456 0)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29811,18 +29816,18 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20709 26818 907104 +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20748 62911 684442 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") (progn - (load "vc-arch") + (load "vc-arch" nil t) (vc-arch-registered file)))) ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20721 17977 14204 +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20748 62911 684442 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-bzr.el @@ -29834,19 +29839,19 @@ (defun vc-bzr-registered (file) (if (vc-find-root file vc-bzr-admin-checkout-format-file) (progn - (load "vc-bzr") + (load "vc-bzr" nil t) (vc-bzr-registered file)))) ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20709 26818 907104 +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20748 62911 684442 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." (when (file-readable-p (expand-file-name "CVS/Entries" (file-name-directory f))) - (load "vc-cvs") + (load "vc-cvs" nil t) (vc-cvs-registered f))) ;;;*** @@ -29939,30 +29944,30 @@ ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20709 26818 907104 +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20748 62911 684442 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) "Return non-nil if FILE is registered with git." (if (vc-find-root file ".git") ; Short cut. (progn - (load "vc-git") + (load "vc-git" nil t) (vc-git-registered file)))) ;;;*** -;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20709 26818 907104 0)) +;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20748 62911 684442 0)) ;;; Generated autoloads from vc/vc-hg.el (defun vc-hg-registered (file) "Return non-nil if FILE is registered with hg." (if (vc-find-root file ".hg") ; short cut (progn - (load "vc-hg") + (load "vc-hg" nil t) (vc-hg-registered file)))) ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20709 26818 907104 +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20748 62911 684442 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-mtn.el @@ -29974,7 +29979,7 @@ (defun vc-mtn-registered (file) (if (vc-find-root file vc-mtn-admin-format) (progn - (load "vc-mtn") + (load "vc-mtn" nil t) (vc-mtn-registered file)))) ;;;*** @@ -30012,7 +30017,7 @@ ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20709 26818 907104 +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20760 54070 584283 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) @@ -30021,13 +30026,13 @@ "_svn") (t ".svn")))) (when (vc-find-root f admin-dir) - (load "vc-svn") + (load "vc-svn" nil t) (vc-svn-registered f)))) ;;;*** ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20777 63161 848428 0)) ;;; Generated autoloads from progmodes/vera-mode.el (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) @@ -30085,7 +30090,7 @@ ;;;*** ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (20709 26818 907104 0)) +;;;;;; (20763 30266 231060 0)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30882,7 +30887,7 @@ ;;;;;; view-mode view-buffer-other-frame view-buffer-other-window ;;;;;; view-buffer view-file-other-frame view-file-other-window ;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting) -;;;;;; "view" "view.el" (20710 47669 981323 0)) +;;;;;; "view" "view.el" (20762 9398 526093 0)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -31044,8 +31049,8 @@ \\[View-scroll-to-buffer-end] scroll so that buffer end is at last line of window. SPC scroll forward \"page size\" lines. With prefix scroll forward prefix lines. -DEL scroll backward \"page size\" lines. - With prefix scroll backward prefix lines. +DEL, S-SPC scroll backward \"page size\" lines. + With prefix scroll backward prefix lines. \\[View-scroll-page-forward-set-page-size] like \\[View-scroll-page-forward] but with prefix sets \"page size\" to prefix. \\[View-scroll-page-backward-set-page-size] like \\[View-scroll-page-backward] but with prefix sets \"page size\" to prefix. \\[View-scroll-half-page-forward] scroll forward \"half page size\" lines. With prefix, sets @@ -31138,8 +31143,8 @@ ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (20762 +;;;;;; 9398 526093 0)) ;;; Generated autoloads from emulation/vip.el (autoload 'vip-setup "vip" "\ @@ -32065,7 +32070,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (20738 27061 124069 0)) +;;;;;; (20766 6456 368550 0)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -32186,33 +32191,6 @@ ;;;*** -;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (20709 26818 907104 0)) -;;; Generated autoloads from play/yow.el - -(autoload 'yow "yow" "\ -Return or display a random Zippy quotation. With prefix arg, insert it. - -\(fn &optional INSERT DISPLAY)" t nil) - -(autoload 'insert-zippyism "yow" "\ -Prompt with completion for a known Zippy quotation, and insert it at point. - -\(fn &optional ZIPPYISM)" t nil) - -(autoload 'apropos-zippy "yow" "\ -Return a list of all Zippy quotes matching REGEXP. -If called interactively, display a list of matches. - -\(fn REGEXP)" t nil) - -(autoload 'psychoanalyze-pinhead "yow" "\ -Zippy goes to the analyst. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads (zone) "zone" "play/zone.el" (20709 26818 907104 ;;;;;; 0)) ;;; Generated autoloads from play/zone.el @@ -32433,8 +32411,8 @@ ;;;;;; "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el" ;;;;;; "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-common-fns.el" -;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (20747 42275 915429 -;;;;;; 589000)) +;;;;;; "w32-fns.el" "w32-vars.el" "x-dnd.el") (20784 36426 559404 +;;;;;; 170000)) ;;;*** ------------------------------------------------------------ revno: 111903 committer: Michael Albinus + + * NEWS: Fix Tramp "adb" entry. Extend list of discontinued Tramp + methods. + 2013-02-25 Paul Eggert Simplify data_start configuration (Bug#13783). === modified file 'etc/NEWS' --- etc/NEWS 2013-02-28 06:30:48 +0000 +++ etc/NEWS 2013-03-01 08:24:19 +0000 @@ -196,12 +196,13 @@ +++ *** New connection method "adb", which allows to access Android -devices by the Android Debug Bridge. The variable `tramp-adb-sdk-dir' -must be set to the Android SDK installation directory. +devices by the Android Debug Bridge. The variable `tramp-adb-program' +can be used to adapt the path of the "adb" program, if needed. -*** The connection methods "scpc" and "rsyncc" are discontinued. The -ssh option "ControlMaster=auto" is set automatically in all ssh-based -methods, when possible. +*** The connection methods "plink1", "ssh1", "ssh2", "scp1", "scp2", +"scpc" and "rsyncc" are discontinued. The ssh option +"ControlMaster=auto" is set automatically in all ssh-based methods, +when possible. +++ *** Handlers for `file-acl' and `set-file-acl' for remote machines ------------------------------------------------------------ revno: 111902 committer: Michael Albinus + + * tramp.texi (Inline methods): Remove "ssh1", "ssh2", "plink1" + and "plink2" entries. "plink2" is obsolete for a long time. + (External methods): Remove "scp1" and "scp2" entries. + 2013-02-28 Michael Albinus * tramp.texi (External methods): Mention `tramp-adb-program'. === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2013-02-28 19:29:41 +0000 +++ doc/misc/tramp.texi 2013-03-01 08:16:13 +0000 @@ -649,13 +649,6 @@ the previous option except that the @command{ssh} package is used, making the connection more secure. -There are also two variants, @option{ssh1} and @option{ssh2}, that -call @samp{ssh -1} and @samp{ssh -2}, respectively. This way, you can -explicitly select whether you want to use the SSH protocol version 1 -or 2 to connect to the remote host. (You can also specify in -@file{~/.ssh/config}, the SSH configuration file, which protocol -should be used, and use the regular @option{ssh} method.) - All the methods based on @command{ssh} have an additional feature: you can specify a host name which looks like @file{host#42} (the real host name, then a hash sign, then a port number). This means to connect to @@ -751,16 +744,6 @@ This supports the @samp{-P} argument. -Additionally, the methods @option{plink1} and @option{plink2} are -provided, which call @samp{plink -1 -ssh} or @samp{plink -2 -ssh} in -order to use SSH protocol version 1 or 2 explicitly. - -CCC: Do we have to connect to the remote host once from the command -line to accept the SSH key? Maybe this can be made automatic? - -CCC: Say something about the first shell command failing. This might -be due to a wrong setting of @code{tramp-rsh-end-of-line}. - @item @option{plinkx} @cindex method plinkx @@ -824,13 +807,6 @@ session can begin to absorb the advantage that the lack of encoding and decoding presents. -There are also two variants, @option{scp1} and @option{scp2}, that -call @samp{ssh -1} and @samp{ssh -2}, respectively. This way, you can -explicitly select whether you want to use the SSH protocol version 1 -or 2 to connect to the remote host. (You can also specify in -@file{~/.ssh/config}, the SSH configuration file, which protocol -should be used, and use the regular @option{scp} method.) - All the @command{ssh} based methods support the @samp{-p} feature where you can specify a port number to connect to in the host name. For example, the host name @file{host#42} tells @value{tramp} to ------------------------------------------------------------ revno: 111901 committer: Michael Albinus + + * net/tramp.el (tramp-obsolete-methods): New defconst. + (tramp-warned-obsolete-methods): New defvar. + (tramp-find-method): Check for obsolete methods. Map them to a + replacement method if appropriate. + + * net/tramp-sh.el (tramp-methods) [scp1, scp2, ssh1, ssh2, plink1]: + Remove methods. + (top): Remove completion functions for "scp1", "scp2", "ssh1", + "ssh2" and "plink1". + 2013-02-28 Dale Sedivec * textmodes/sgml-mode.el (sgml-syntax-propertize-function): === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-02-26 08:46:38 +0000 +++ lisp/net/tramp-sh.el 2013-03-01 08:13:53 +0000 @@ -126,42 +126,6 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - '("scp1" - (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") - ("-1") ("-e" "none") ("%h"))) - (tramp-async-args (("-q"))) - (tramp-remote-shell "/bin/sh") - (tramp-remote-shell-args ("-c")) - (tramp-copy-program "scp") - (tramp-copy-args (("-1") ("-P" "%p") ("-p" "%k") - ("-q") ("-r") ("%c"))) - (tramp-copy-keep-date t) - (tramp-copy-recursive t) - (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") - ("-o" "UserKnownHostsFile=/dev/null") - ("-o" "StrictHostKeyChecking=no"))) - (tramp-default-port 22))) -;;;###tramp-autoload -(add-to-list 'tramp-methods - '("scp2" - (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") - ("-2") ("-e" "none") ("%h"))) - (tramp-async-args (("-q"))) - (tramp-remote-shell "/bin/sh") - (tramp-remote-shell-args ("-c")) - (tramp-copy-program "scp") - (tramp-copy-args (("-2") ("-P" "%p") ("-p" "%k") - ("-q") ("-r") ("%c"))) - (tramp-copy-keep-date t) - (tramp-copy-recursive t) - (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") - ("-o" "UserKnownHostsFile=/dev/null") - ("-o" "StrictHostKeyChecking=no"))) - (tramp-default-port 22))) -;;;###tramp-autoload -(add-to-list 'tramp-methods '("scpx" (tramp-login-program "ssh") (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") @@ -233,32 +197,6 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - '("ssh1" - (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") - ("-1") ("-e" "none") ("%h"))) - (tramp-async-args (("-q"))) - (tramp-remote-shell "/bin/sh") - (tramp-remote-shell-args ("-c")) - (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") - ("-o" "UserKnownHostsFile=/dev/null") - ("-o" "StrictHostKeyChecking=no"))) - (tramp-default-port 22))) -;;;###tramp-autoload -(add-to-list 'tramp-methods - '("ssh2" - (tramp-login-program "ssh") - (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") - ("-2") ("-e" "none") ("%h"))) - (tramp-async-args (("-q"))) - (tramp-remote-shell "/bin/sh") - (tramp-remote-shell-args ("-c")) - (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") - ("-o" "UserKnownHostsFile=/dev/null") - ("-o" "StrictHostKeyChecking=no"))) - (tramp-default-port 22))) -;;;###tramp-autoload -(add-to-list 'tramp-methods '("sshx" (tramp-login-program "ssh") (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c") @@ -316,14 +254,6 @@ (tramp-default-port 22))) ;;;###tramp-autoload (add-to-list 'tramp-methods - '("plink1" - (tramp-login-program "plink") - (tramp-login-args (("-l" "%u") ("-P" "%p") ("-1" "-ssh") ("%h"))) - (tramp-remote-shell "/bin/sh") - (tramp-remote-shell-args ("-c")) - (tramp-default-port 22))) -;;;###tramp-autoload -(add-to-list 'tramp-methods `("plinkx" (tramp-login-program "plink") ;; ("%h") must be a single element, see @@ -436,16 +366,12 @@ (tramp-set-completion-function "rcp" tramp-completion-function-alist-rsh) (tramp-set-completion-function "remcp" tramp-completion-function-alist-rsh) (tramp-set-completion-function "scp" tramp-completion-function-alist-ssh) - (tramp-set-completion-function "scp1" tramp-completion-function-alist-ssh) - (tramp-set-completion-function "scp2" tramp-completion-function-alist-ssh) (tramp-set-completion-function "scpx" tramp-completion-function-alist-ssh) (tramp-set-completion-function "sftp" tramp-completion-function-alist-ssh) (tramp-set-completion-function "rsync" tramp-completion-function-alist-ssh) (tramp-set-completion-function "rsh" tramp-completion-function-alist-rsh) (tramp-set-completion-function "remsh" tramp-completion-function-alist-rsh) (tramp-set-completion-function "ssh" tramp-completion-function-alist-ssh) - (tramp-set-completion-function "ssh1" tramp-completion-function-alist-ssh) - (tramp-set-completion-function "ssh2" tramp-completion-function-alist-ssh) (tramp-set-completion-function "sshx" tramp-completion-function-alist-ssh) (tramp-set-completion-function "telnet" tramp-completion-function-alist-telnet) @@ -456,8 +382,6 @@ "krlogin" tramp-completion-function-alist-rsh) (tramp-set-completion-function "plink" tramp-completion-function-alist-ssh) (tramp-set-completion-function - "plink1" tramp-completion-function-alist-ssh) - (tramp-set-completion-function "plinkx" tramp-completion-function-alist-putty) (tramp-set-completion-function "pscp" tramp-completion-function-alist-ssh) (tramp-set-completion-function "fcp" tramp-completion-function-alist-ssh))) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2013-02-23 12:40:14 +0000 +++ lisp/net/tramp.el 2013-03-01 08:13:53 +0000 @@ -1170,21 +1170,45 @@ (and (stringp name) (string-match tramp-file-name-regexp name)))) +;; Obsoleted with Tramp 2.2.7. +(defconst tramp-obsolete-methods + '("ssh1" "ssh2" "scp1" "scp2" "scpc" "rsyncc" "plink1") + "Obsolete methods.") + +(defvar tramp-warned-obsolete-methods nil + "Which methods the user has been warned to be obsolete.") + (defun tramp-find-method (method user host) "Return the right method string to use. This is METHOD, if non-nil. Otherwise, do a lookup in -`tramp-default-method-alist'." - (or method - (let ((choices tramp-default-method-alist) - lmethod item) - (while choices - (setq item (pop choices)) - (when (and (string-match (or (nth 0 item) "") (or host "")) - (string-match (or (nth 1 item) "") (or user ""))) - (setq lmethod (nth 2 item)) - (setq choices nil))) - lmethod) - tramp-default-method)) +`tramp-default-method-alist'. It maps also obsolete methods to +their replacement." + (let ((result + (or method + (let ((choices tramp-default-method-alist) + lmethod item) + (while choices + (setq item (pop choices)) + (when (and (string-match (or (nth 0 item) "") (or host "")) + (string-match (or (nth 1 item) "") (or user ""))) + (setq lmethod (nth 2 item)) + (setq choices nil))) + lmethod) + tramp-default-method))) + ;; This is needed for a transition period only. + (when (member result tramp-obsolete-methods) + (unless (member result tramp-warned-obsolete-methods) + (if noninteractive + (warn "Method %s is obsolete, using %s" + result (substring result 0 -1)) + (unless (y-or-n-p (format "Method %s is obsolete, use %s? " + result (substring result 0 -1))) + (error 'file-error "Method \"%s\" not supported" result))) + (add-to-list 'tramp-warned-obsolete-methods result)) + ;; This works with the current set of `tramp-obsolete-methods'. + ;; Must be improved, if their are more sophisticated replacements. + (setq result (substring result 0 -1))) + result)) (defun tramp-find-user (method user host) "Return the right user string to use. ------------------------------------------------------------ revno: 111900 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13844 author: Dale Sedivec committer: Stefan Monnier branch nick: trunk timestamp: Thu 2013-02-28 22:43:57 -0500 message: * lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): Return valid syntax-table property value when converting quotes within text from string syntax to punctuation syntax. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-02-28 21:51:11 +0000 +++ lisp/ChangeLog 2013-03-01 03:43:57 +0000 @@ -1,3 +1,9 @@ +2013-02-28 Dale Sedivec + + * textmodes/sgml-mode.el (sgml-syntax-propertize-function): + Return valid syntax-table property value when converting + quotes within text from string syntax to punctuation syntax (bug#13844). + 2013-02-28 Juri Linkov * dired-aux.el (dired-diff): If file at point is a backup file, === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2013-02-22 02:33:42 +0000 +++ lisp/textmodes/sgml-mode.el 2013-03-01 03:43:57 +0000 @@ -312,8 +312,8 @@ (defconst sgml-syntax-propertize-function (syntax-propertize-rules - ;; Use the `b' style of comments to avoid interference with the -- ... -- - ;; comments recognized when `sgml-specials' includes ?-. + ;; Use the `b' style of comments to avoid interference with the -- ... -- + ;; comments recognized when `sgml-specials' includes ?-. ;; FIXME: beware of blabla !! ("\\(<\\)!--" (1 "< b")) ("--[ \t\n]*\\(>\\)" (1 "> b")) @@ -322,7 +322,7 @@ ;; going to change, so as not to need to flush the data we just computed. ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0)))) (goto-char (match-end 0))) - ".")))) + (string-to-syntax "."))))) "Syntactic keywords for `sgml-mode'.") ;; internal