1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00

Fix typos.

* allout.el
* dired-aux.el
* dired-x.el
* epa-file.el
* ps-print.el
* shell.el
* vc-hooks.el
* vc-rcs.el
* vc-sccs.el
* vc.el
* view.el
* wdired.el
* emacs-lisp/authors.el
* net/dig.el
* net/socks.el
* net/zeroconf.el
* obsolete/vc-mcvs.el
* progmodes/gdb-mi.el
* progmodes/grep.el
* progmodes/idlw-help.el
* progmodes/idlw-shell.el
* progmodes/idlwave.el
* progmodes/inf-lisp.el
* textmodes/bibtex.el
* textmodes/ispell.el
* textmodes/reftex-toc.el
This commit is contained in:
Juanma Barranquero 2009-09-24 01:37:14 +00:00
parent 62136c5d4b
commit 5a0c3f568d
29 changed files with 498 additions and 378 deletions

View file

@ -1,3 +1,121 @@
2009-09-24 Juanma Barranquero <lekktu@gmail.com>
* allout.el (allout-overlay-interior-modification-handler)
(allout-obtain-passphrase):
* epa-file.el (epa-file-write-region):
* ps-print.el (ps-begin-job):
* vc-hooks.el (vc-toggle-read-only):
* vc-rcs.el (vc-rcs-rollback):
* vc-sccs.el (vc-sccs-rollback):
* vc.el (vc-deduce-fileset, vc-next-action, vc-register-with)
(vc-version-diff, vc-revert, vc-rollback):
* wdired.el (wdired-check-kill-buffer):
* emacs-lisp/authors.el (authors):
* net/socks.el (socks-open-connection):
* net/zeroconf.el (zeroconf-service-add-hook):
* obsolete/vc-mcvs.el (vc-mcvs-register):
* progmodes/gdb-mi.el (def-gdb-thread-buffer-gud-command)
(gdb-select-frame):
* progmodes/grep.el (lgrep, rgrep):
* progmodes/idlw-help.el (idlwave-help-check-locations)
(idlwave-help-html-link, idlwave-help-assistant-open-link):
* textmodes/ispell.el (ispell-find-aspell-dictionaries):
* textmodes/reftex-toc.el (reftex-toc-promote-prepare)
(reftex-toc-rename-label): Fix typos in error messages.
* dired-aux.el (dired-do-shell-command): Reflow docstring.
(dired-copy-how-to-fn): Doc fix.
(dired-files-attributes, dired-read-shell-command):
Fix typos in docstrings.
* dired-x.el (dired-enable-local-variables, dired-filename-at-point)
(dired-x-find-file-other-window): Reflow docstrings.
(dired-omit-marker-char, dired-read-shell-command)
(dired-x-submit-report): Fix typos in docstrings.
* shell.el (shell-mode-hook):
* view.el (View-scroll-line-forward):
* progmodes/inf-lisp.el (inferior-lisp-mode-hook):
Fix typos in docstrings.
* net/dig.el (dig-invoke): Fix typo in docstring.
(query-dig): Reflow docstring.
* progmodes/idlwave.el (idlwave-create-user-catalog-file)
(idlwave-quoted, idlwave-rinfo-max-source-lines): Doc fixes.
(idlwave-abbrev-move, idlwave-auto-routine-info-updates)
(idlwave-begin-block-reg, idlwave-begin-unit-reg)
(idlwave-beginning-of-subprogram, idlwave-block-jump-out)
(idlwave-block-match-regexp, idlwave-calculate-paren-indent)
(idlwave-check-abbrev, idlwave-class-file-or-buffer)
(idlwave-class-found-in, idlwave-complete, idlwave-complete-in-buffer)
(idlwave-completion-map, idlwave-current-indent)
(idlwave-custom-ampersand-surround, idlwave-customize)
(idlwave-default-font-lock-items, idlwave-default-insert-timestamp)
(idlwave-define-abbrev, idlwave-determine-class-special)
(idlwave-do-action, idlwave-doc-header, idlwave-doc-modification)
(idlwave-end-block-reg, idlwave-end-of-statement)
(idlwave-end-of-statement0, idlwave-end-of-subprogram)
(idlwave-end-unit-reg, idlwave-entry-find-keyword)
(idlwave-explicit-class-listed, idlwave-file-header)
(idlwave-fill-paragraph, idlwave-find-class-definition)
(idlwave-fix-keywords, idlwave-hang-indent-regexp, idlwave-hard-tab)
(idlwave-idlwave_routine_info-compiled, idlwave-in-comment)
(idlwave-in-quote, idlwave-indent-action-table)
(idlwave-indent-expand-table, idlwave-indent-line)
(idlwave-indent-subprogram, idlwave-indent-to-open-paren)
(idlwave-is-comment-line, idlwave-is-comment-or-empty-line)
(idlwave-is-continuation-line, idlwave-is-pointer-dereference)
(idlwave-kill-autoloaded-buffers, idlwave-lib-p, idlwave-look-at)
(idlwave-make-tags, idlwave-mode, idlwave-mode-abbrev-table)
(idlwave-mouse-active-rinfo, idlwave-newline, idlwave-no-change-comment)
(idlwave-outlawed-buffers, idlwave-popup-select)
(idlwave-previous-statement, idlwave-rescan-catalog-directories)
(idlwave-routine-entry-compare, idlwave-routine-info.pro)
(idlwave-scan-all-buffers-for-routine-info, idlwave-scan-class-info)
(idlwave-shell-automatic-start, idlwave-shell-explicit-file-name)
(idlwave-show-begin, idlwave-split-line, idlwave-split-link-target)
(idlwave-statement-type, idlwave-struct-skip)
(idlwave-substitute-link-target, idlwave-toggle-comment-region)
(idlwave-update-current-buffer-info, idlwave-use-library-catalogs)
(idlwave-what-module-find-class): Fix typos in docstrings.
(idlwave-all-method-classes, idlwave-calc-hanging-indent)
(idlwave-calculate-cont-indent, idlwave-expand-equal)
(idlwave-find-module, idlwave-find-structure-definition)
(idlwave-init-rinfo-when-idle-after, idlwave-insert-source-location)
(idlwave-list-load-path-shadows, idlwave-next-statement)
(idlwave-routine-entry-compare-twins, idlwave-routine-info)
(idlwave-routines, idlwave-sintern-rinfo-list, idlwave-statement-match)
(idlwave-template): Reflow docstrings.
* progmodes/idlw-shell.el (idlwave-shell-syntax-error): Doc fix.
(idlwave-shell-batch-command, idlwave-shell-bp-alist)
(idlwave-shell-bp-get, idlwave-shell-bp-overlays)
(idlwave-shell-bp-query, idlwave-shell-break-here, idlwave-shell-buffer)
(idlwave-shell-display-line, idlwave-shell-display-wframe)
(idlwave-shell-electric-debug-mode, idlwave-shell-examine-select)
(idlwave-shell-file-name-chars, idlwave-shell-filter-bp)
(idlwave-shell-goto-frame, idlwave-shell-halt-messages-re)
(idlwave-shell-highlighting-and-faces, idlwave-shell-idl-wframe)
(idlwave-shell-mode-hook, idlwave-shell-mode-line-info)
(idlwave-shell-mode-map, idlwave-shell-module-source-filter)
(idlwave-shell-mouse-help, idlwave-shell-mouse-print)
(idlwave-shell-pc-frame, idlwave-shell-pending-commands)
(idlwave-shell-print, idlwave-shell-quit, idlwave-shell-redisplay)
(idlwave-shell-scan-for-state, idlwave-shell-send-command)
(idlwave-shell-sentinel-hook, idlwave-shell-separate-examine-output)
(idlwave-shell-shell-command, idlwave-shell-sources-alist)
(idlwave-shell-sources-bp, idlwave-shell-sources-filter)
(idlwave-shell-step, idlwave-shell-use-breakpoint-glyph)
(idlwave-toolbar-add-everywhere, idlwave-toolbar-toggle):
Fix typos in docstrings.
(idlwave-shell-bp, idlwave-shell-clear-current-bp)
(idlwave-shell-hide-output, idlwave-shell-mode)
(idlwave-shell-run-region, idlwave-shell-set-bp-in-module):
Reflow docstrings.
* textmodes/bibtex.el (bibtex-sort-entry-class): Fix group name.
2009-09-24 Ivan Kanis <apple@kanis.eu> 2009-09-24 Ivan Kanis <apple@kanis.eu>
* term.el (term-bold-attribute): New var. * term.el (term-bold-attribute): New var.
@ -351,9 +469,9 @@
2009-09-15 Stephen Eglen <stephen@gnu.org> 2009-09-15 Stephen Eglen <stephen@gnu.org>
* iswitchb.el (iswitchb-read-buffer): When selecting a match from * iswitchb.el (iswitchb-read-buffer): When selecting a match from
the virtual-buffers, use the name of the buffer specified by the virtual-buffers, use the name of the buffer specified by
find-file-noselect, as the match may be a symlink. (This was a find-file-noselect, as the match may be a symlink. (This was a
problem if the target and the symlink had differet names.) problem if the target and the symlink had different names.)
2009-09-15 Stefan Monnier <monnier@iro.umontreal.ca> 2009-09-15 Stefan Monnier <monnier@iro.umontreal.ca>

View file

@ -2204,10 +2204,10 @@ internal functions use this feature cohesively bunch changes."
(concat "Modify concealed text? (\"no\" just aborts," (concat "Modify concealed text? (\"no\" just aborts,"
" \\[keyboard-quit] also reconceals) ")))) " \\[keyboard-quit] also reconceals) "))))
(progn (goto-char start) (progn (goto-char start)
(error "Concealed-text change refused."))) (error "Concealed-text change refused")))
(quit (allout-flag-region ol-start ol-end nil) (quit (allout-flag-region ol-start ol-end nil)
(allout-flag-region ol-start ol-end t) (allout-flag-region ol-start ol-end t)
(error "Concealed-text change abandoned, text reconcealed.")))) (error "Concealed-text change abandoned, text reconcealed"))))
(goto-char start)))) (goto-char start))))
;;;_ > allout-before-change-handler (beg end) ;;;_ > allout-before-change-handler (beg end)
(defun allout-before-change-handler (beg end) (defun allout-before-change-handler (beg end)
@ -6333,7 +6333,7 @@ of the availability of a cached copy."
nil) nil)
t)) t))
(progn (pgg-remove-passphrase-from-cache cache-id t) (progn (pgg-remove-passphrase-from-cache cache-id t)
(error "Wrong passphrase.")))) (error "Wrong passphrase"))))
;; No verifier string -- force confirmation by repetition of ;; No verifier string -- force confirmation by repetition of
;; (new) passphrase: ;; (new) passphrase:
((or fetch-pass (not cached)) ((or fetch-pass (not cached))
@ -6355,7 +6355,7 @@ of the availability of a cached copy."
;; recurse to this routine: ;; recurse to this routine:
(pgg-read-passphrase prompt-sans-hint cache-id t)) (pgg-read-passphrase prompt-sans-hint cache-id t))
(pgg-remove-passphrase-from-cache cache-id t) (pgg-remove-passphrase-from-cache cache-id t)
(error "Confirmation failed.")))))))) (error "Confirmation failed"))))))))
;;;_ > allout-encrypted-topic-p () ;;;_ > allout-encrypted-topic-p ()
(defun allout-encrypted-topic-p () (defun allout-encrypted-topic-p ()
"True if the current topic is encryptable and encrypted." "True if the current topic is encryptable and encrypted."

View file

@ -196,7 +196,7 @@ condition. Two file items are considered to match if they are equal
(defun dired-files-attributes (dir) (defun dired-files-attributes (dir)
"Return a list of all file names and attributes from DIR. "Return a list of all file names and attributes from DIR.
List has a form of (file-name full-file-name (attribute-list))" List has a form of (file-name full-file-name (attribute-list))."
(mapcar (mapcar
(lambda (file-name) (lambda (file-name)
(let ((full-file-name (expand-file-name file-name dir))) (let ((full-file-name (expand-file-name file-name dir)))
@ -488,7 +488,7 @@ to the end of the list of defaults just after the default value."
;; This is an extra function so that you can redefine it, e.g., to use gmhist. ;; This is an extra function so that you can redefine it, e.g., to use gmhist.
(defun dired-read-shell-command (prompt arg files) (defun dired-read-shell-command (prompt arg files)
"Read a dired shell command prompting with PROMPT (using read-shell-command). "Read a dired shell command prompting with PROMPT (using `read-shell-command').
ARG is the prefix arg and may be used to indicate in the prompt which ARG is the prefix arg and may be used to indicate in the prompt which
FILES are affected." FILES are affected."
(minibuffer-with-setup-hook (minibuffer-with-setup-hook
@ -551,9 +551,9 @@ This feature does not try to redisplay Dired buffers afterward, as
there's no telling what files COMMAND may have changed. there's no telling what files COMMAND may have changed.
Type \\[dired-do-redisplay] to redisplay the marked files. Type \\[dired-do-redisplay] to redisplay the marked files.
When COMMAND runs, its working directory is the top-level directory of When COMMAND runs, its working directory is the top-level directory
the Dired buffer, so output files usually are created there instead of of the Dired buffer, so output files usually are created there
in a subdir. instead of in a subdir.
In a noninteractive call (from Lisp code), you must specify In a noninteractive call (from Lisp code), you must specify
the list of file names explicitly with the FILE-LIST argument, which the list of file names explicitly with the FILE-LIST argument, which
@ -1606,7 +1606,7 @@ Optional arg HOW-TO determiness how to treat the target.
;; symlinks. ;; symlinks.
(defvar dired-copy-how-to-fn nil (defvar dired-copy-how-to-fn nil
"nil or a function used by `dired-do-copy' to determine target. "Either nil or a function used by `dired-do-copy' to determine target.
See HOW-TO argument for `dired-do-create-files'.") See HOW-TO argument for `dired-do-create-files'.")
;;;###autoload ;;;###autoload

View file

@ -208,8 +208,8 @@ The value can be t, nil or something else.
A value of t means local-variables lists are obeyed; A value of t means local-variables lists are obeyed;
nil means they are ignored; anything else means query. nil means they are ignored; anything else means query.
This temporarily overrides the value of `enable-local-variables' when listing This temporarily overrides the value of `enable-local-variables' when
a directory. See also `dired-local-variables-file'." listing a directory. See also `dired-local-variables-file'."
:type 'boolean :type 'boolean
:group 'dired-x) :group 'dired-x)
@ -553,7 +553,7 @@ need to match the entire file name.")
;; \017=^O for Omit - other packages can chose other control characters. ;; \017=^O for Omit - other packages can chose other control characters.
(defvar dired-omit-marker-char ?\017 (defvar dired-omit-marker-char ?\017
"Temporary marker used by dired-omit. "Temporary marker used by Dired-Omit.
Should never be used as marker by the user or other packages.") Should never be used as marker by the user or other packages.")
(defun dired-omit-startup () (defun dired-omit-startup ()
@ -1209,7 +1209,7 @@ See `dired-guess-shell-alist-user'."
;; REDEFINE. ;; REDEFINE.
;; Redefine dired-aux.el's version: ;; Redefine dired-aux.el's version:
(defun dired-read-shell-command (prompt arg files) (defun dired-read-shell-command (prompt arg files)
"Read a dired shell command prompting with PROMPT (using read-shell-command). "Read a dired shell command prompting with PROMPT (using `read-shell-command').
ARG is the prefix arg and may be used to indicate in the prompt which ARG is the prefix arg and may be used to indicate in the prompt which
FILES are affected. FILES are affected.
This is an extra function so that you can redefine it." This is an extra function so that you can redefine it."
@ -1325,7 +1325,7 @@ for more info."
;; * `dired-simultaneous-find-file' runs through FILE-LIST decrementing the ;; * `dired-simultaneous-find-file' runs through FILE-LIST decrementing the
;;; list each time. ;;; list each time.
;;; ;;;
;; * If NOSELECT is non-nil then just run `find-file-noselect' on each ;; * If NOSELECT is non-nil then just run `find-file-noselect' on each
;;; element of FILE-LIST. ;;; element of FILE-LIST.
;;; ;;;
;; * If NOSELECT is nil then calculate the `size' of the window for each file ;; * If NOSELECT is nil then calculate the `size' of the window for each file
@ -1682,8 +1682,8 @@ or to test if that file exists. Use minibuffer after snatching filename."
May create a new window, or reuse an existing one. May create a new window, or reuse an existing one.
See the function `display-buffer'. See the function `display-buffer'.
Identical to `find-file-other-window' except when called interactively, with a Identical to `find-file-other-window' except when called interactively, with
prefix arg \(e.g., \\[universal-argument]\), in which case it guesses filename near point. a prefix arg \(e.g., \\[universal-argument]\), in which case it guesses filename near point.
Useful for editing file mentioned in buffer you are viewing, Useful for editing file mentioned in buffer you are viewing,
or to test if that file exists. Use minibuffer after snatching filename." or to test if that file exists. Use minibuffer after snatching filename."
(interactive (list (read-filename-at-point "Find file: "))) (interactive (list (read-filename-at-point "Find file: ")))
@ -1694,8 +1694,8 @@ or to test if that file exists. Use minibuffer after snatching filename."
;; Fixme: This should probably use `thing-at-point'. -- fx ;; Fixme: This should probably use `thing-at-point'. -- fx
(defun dired-filename-at-point () (defun dired-filename-at-point ()
"Get the filename closest to point, but do not change position. "Get the filename closest to point, but do not change position.
Has a preference for looking backward when not directly on a symbol. Not Has a preference for looking backward when not directly on a symbol.
perfect - point must be in middle of or end of filename." Not perfect - point must be in middle of or end of filename."
(let ((filename-chars "-.[:alnum:]_/:$+@") (let ((filename-chars "-.[:alnum:]_/:$+@")
start end filename prefix) start end filename prefix)
@ -1775,7 +1775,7 @@ If `current-prefix-arg' is non-nil, uses name at point as guess."
(defun dired-x-submit-report () (defun dired-x-submit-report ()
"Submit via `reporter.el' a bug report on program. "Submit via `reporter.el' a bug report on program.
Send report on `dired-x-file' version `dired-x-version,' to Send report on `dired-x-file' version `dired-x-version', to
`dired-x-maintainer' at address `dired-x-help-address' listing `dired-x-maintainer' at address `dired-x-help-address' listing
variables `dired-x-variable-list' in the message." variables `dired-x-variable-list' in the message."
(interactive) (interactive)

View file

@ -3465,7 +3465,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
;;;;;; dired-diff) "dired-aux" "dired-aux.el" "6ec9fac2638e7b16a006e164ba4454cc") ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "19cd0d559197e5587fe27e1a81fb2644")
;;; Generated autoloads from dired-aux.el ;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\ (autoload 'dired-diff "dired-aux" "\
@ -3591,9 +3591,9 @@ This feature does not try to redisplay Dired buffers afterward, as
there's no telling what files COMMAND may have changed. there's no telling what files COMMAND may have changed.
Type \\[dired-do-redisplay] to redisplay the marked files. Type \\[dired-do-redisplay] to redisplay the marked files.
When COMMAND runs, its working directory is the top-level directory of When COMMAND runs, its working directory is the top-level directory
the Dired buffer, so output files usually are created there instead of of the Dired buffer, so output files usually are created there
in a subdir. instead of in a subdir.
In a noninteractive call (from Lisp code), you must specify In a noninteractive call (from Lisp code), you must specify
the list of file names explicitly with the FILE-LIST argument, which the list of file names explicitly with the FILE-LIST argument, which
@ -3918,7 +3918,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;*** ;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
;;;;;; "c426566bb1493ccba92a56f402ba565f") ;;;;;; "1a0298749959c80c24c73b8bec5f1f74")
;;; Generated autoloads from dired-x.el ;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\ (autoload 'dired-jump "dired-x" "\

View file

@ -866,7 +866,7 @@ buffer *Authors Errors* containing references to unknown files."
(unless (file-exists-p (expand-file-name "src/emacs.c" root)) (unless (file-exists-p (expand-file-name "src/emacs.c" root))
(unless (y-or-n-p (unless (y-or-n-p
(format "Not the root directory of Emacs: %s, continue? " root)) (format "Not the root directory of Emacs: %s, continue? " root))
(error "Not the root directory."))) (error "Not the root directory")))
(dolist (log logs) (dolist (log logs)
(when (string-match "ChangeLog\\(.[0-9]+\\)?$" log) (when (string-match "ChangeLog\\(.[0-9]+\\)?$" log)
(message "Scanning %s..." log) (message "Scanning %s..." log)

View file

@ -156,7 +156,7 @@ way."
(defun epa-file-write-region (start end file &optional append visit lockname (defun epa-file-write-region (start end file &optional append visit lockname
mustbenew) mustbenew)
(if append (if append
(error "Can't append to the file.")) (error "Can't append to the file"))
(setq file (expand-file-name file)) (setq file (expand-file-name file))
(let* ((coding-system (or coding-system-for-write (let* ((coding-system (or coding-system-for-write
(if (fboundp 'select-safe-coding-system) (if (fboundp 'select-safe-coding-system)

View file

@ -68,10 +68,10 @@ If nil, use system defaults."
query-type query-class query-option query-type query-class query-option
dig-option server) dig-option server)
"Call dig with given arguments and return buffer containing output. "Call dig with given arguments and return buffer containing output.
DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional string DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional
with a DNS type. QUERY-CLASS is an optional string with a DNS class. string with a DNS type. QUERY-CLASS is an optional string with a DNS
QUERY-OPTION is an optional string with dig \"query options\". class. QUERY-OPTION is an optional string with dig \"query options\".
DIG-OPTIONS is an optional string with parameters for the dig program. DIG-OPTION is an optional string with parameters for the dig program.
SERVER is an optional string with a domain name server to query. SERVER is an optional string with a domain name server to query.
Dig is an external program found in the BIND name server distribution, Dig is an external program found in the BIND name server distribution,
@ -171,9 +171,9 @@ Optional arguments are passed to `dig-invoke'."
(defun query-dig (domain &optional (defun query-dig (domain &optional
query-type query-class query-option dig-option server) query-type query-class query-option dig-option server)
"Query addresses of a DOMAIN using dig. "Query addresses of a DOMAIN using dig.
It works by calling `dig-invoke' and `dig-extract-rr'. Optional It works by calling `dig-invoke' and `dig-extract-rr'.
arguments are passed to `dig-invoke' and `dig-extract-rr'. Returns Optional arguments are passed to `dig-invoke' and `dig-extract-rr'.
nil for domain/class/type queries that results in no data." Returns nil for domain/class/type queries that result in no data."
(let ((buffer (dig-invoke domain query-type query-class (let ((buffer (dig-invoke domain query-type query-class
query-option dig-option server))) query-option dig-option server)))
(when buffer (when buffer

View file

@ -372,28 +372,28 @@ This variable is only used if the variable
(display-buffer buffer-name)) (display-buffer buffer-name))
;;;###autoload ;;;###autoload
(defun ifconfig () (defun ifconfig ()
"Run ifconfig and display diagnostic output." "Run ifconfig and display diagnostic output."
(interactive) (interactive)
(net-utils-run-simple (net-utils-run-simple
(format "*%s*" ifconfig-program) (format "*%s*" ifconfig-program)
ifconfig-program ifconfig-program
ifconfig-program-options)) ifconfig-program-options))
(defalias 'ipconfig 'ifconfig) (defalias 'ipconfig 'ifconfig)
;;;###autoload ;;;###autoload
(defun iwconfig () (defun iwconfig ()
"Run iwconfig and display diagnostic output." "Run iwconfig and display diagnostic output."
(interactive) (interactive)
(net-utils-run-simple (net-utils-run-simple
(format "*%s*" iwconfig-program) (format "*%s*" iwconfig-program)
iwconfig-program iwconfig-program
iwconfig-program-options)) iwconfig-program-options))
;;;###autoload ;;;###autoload
(defun netstat () (defun netstat ()
"Run netstat and display diagnostic output." "Run netstat and display diagnostic output."
(interactive) (interactive)
(net-utils-run-simple (net-utils-run-simple
(format "*%s*" netstat-program) (format "*%s*" netstat-program)
@ -402,7 +402,7 @@ This variable is only used if the variable
;;;###autoload ;;;###autoload
(defun arp () (defun arp ()
"Run arp and display diagnostic output." "Run arp and display diagnostic output."
(interactive) (interactive)
(net-utils-run-simple (net-utils-run-simple
(format "*%s*" arp-program) (format "*%s*" arp-program)

View file

@ -387,7 +387,7 @@ version.")
((= authtype socks-authentication-null) ((= authtype socks-authentication-null)
(and socks-debug (message "No authentication necessary"))) (and socks-debug (message "No authentication necessary")))
((= authtype socks-authentication-failure) ((= authtype socks-authentication-failure)
(error "No acceptable authentication methods found.")) (error "No acceptable authentication methods found"))
(t (t
(let* ((auth-type (gethash 'authtype info)) (let* ((auth-type (gethash 'authtype info))
(auth-handler (assoc auth-type socks-authentication-methods)) (auth-handler (assoc auth-type socks-authentication-methods))

View file

@ -334,7 +334,7 @@ The attributes of SERVICE can be retrieved via the functions
(let ((l-hook (gethash type zeroconf-service-removed-hooks-hash nil))) (let ((l-hook (gethash type zeroconf-service-removed-hooks-hash nil)))
(add-hook 'l-hook function) (add-hook 'l-hook function)
(puthash type l-hook zeroconf-service-removed-hooks-hash))) (puthash type l-hook zeroconf-service-removed-hooks-hash)))
(t (error "EVENT must be either `:new' or `:removed'.")))) (t (error "EVENT must be either `:new' or `:removed'"))))
(defun zeroconf-get-host () (defun zeroconf-get-host ()
"Returns the local host name as string." "Returns the local host name as string."

View file

@ -200,7 +200,7 @@ COMMENT can be used to provide an initial description of FILE.
Passes either `vc-mcvs-register-switches' or `vc-register-switches' Passes either `vc-mcvs-register-switches' or `vc-register-switches'
to the Meta-CVS command." to the Meta-CVS command."
;; FIXME: multiple-file case should be made to work. ;; FIXME: multiple-file case should be made to work.
(if (> (length files) 1) (error "Registering filesets is not yet supported.")) (if (> (length files) 1) (error "Registering filesets is not yet supported"))
(let* ((file (car files)) (let* ((file (car files))
(filename (file-name-nondirectory file)) (filename (file-name-nondirectory file))
(extpos (string-match "\\." filename)) (extpos (string-match "\\." filename))

View file

@ -1918,7 +1918,7 @@ current thread and update GDB buffers."
;; thread ;; thread
(when (not gdb-register-names) (when (not gdb-register-names)
(gdb-input (gdb-input
(list (concat "-data-list-register-names" (list (concat "-data-list-register-names"
(if (string-equal gdb-version "7.0+") (if (string-equal gdb-version "7.0+")
(concat" --thread " thread-id))) (concat" --thread " thread-id)))
'gdb-register-names-handler))) 'gdb-register-names-handler)))
@ -2767,7 +2767,7 @@ line."
(let ((gdb-thread-number (bindat-get-field thread 'id)) (let ((gdb-thread-number (bindat-get-field thread 'id))
(gdb-gud-control-all-threads nil)) (gdb-gud-control-all-threads nil))
(call-interactively #',gud-command)) (call-interactively #',gud-command))
(error "Available in non-stop mode only, customize gdb-non-stop-setting.")) (error "Available in non-stop mode only, customize `gdb-non-stop-setting'"))
,doc)) ,doc))
(def-gdb-thread-buffer-gud-command (def-gdb-thread-buffer-gud-command
@ -3474,7 +3474,7 @@ member."
(setq gdb-frame-number new-level) (setq gdb-frame-number new-level)
(gdb-input (list (concat "-stack-select-frame " new-level) 'ignore)) (gdb-input (list (concat "-stack-select-frame " new-level) 'ignore))
(gdb-update)) (gdb-update))
(error "Could not select frame for non-current thread.")) (error "Could not select frame for non-current thread"))
(error "Not recognized as frame line")))) (error "Not recognized as frame line"))))

View file

@ -826,7 +826,7 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
(list (read-from-minibuffer "Run: " grep-command (list (read-from-minibuffer "Run: " grep-command
nil nil 'grep-history))) nil nil 'grep-history)))
((not grep-template) ((not grep-template)
(error "grep.el: No `grep-template' available.")) (error "grep.el: No `grep-template' available"))
(t (let* ((regexp (grep-read-regexp)) (t (let* ((regexp (grep-read-regexp))
(files (grep-read-files regexp)) (files (grep-read-files regexp))
(dir (read-directory-name "In directory: " (dir (read-directory-name "In directory: "
@ -903,7 +903,7 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
(list (read-from-minibuffer "Run: " grep-find-command (list (read-from-minibuffer "Run: " grep-find-command
nil nil 'grep-find-history))) nil nil 'grep-find-history)))
((not grep-find-template) ((not grep-find-template)
(error "grep.el: No `grep-find-template' available.")) (error "grep.el: No `grep-find-template' available"))
(t (let* ((regexp (grep-read-regexp)) (t (let* ((regexp (grep-read-regexp))
(files (grep-read-files regexp)) (files (grep-read-files regexp))
(dir (read-directory-name "Base directory: " (dir (read-directory-name "Base directory: "

View file

@ -359,7 +359,7 @@ Here are all keybindings.
(message "Cannot locate IDL Assistant, enabling default browser.") (message "Cannot locate IDL Assistant, enabling default browser.")
(setq idlwave-help-use-assistant nil) (setq idlwave-help-use-assistant nil)
(unless idlwave-help-browse-url-available (unless idlwave-help-browse-url-available
(error "browse-url is not available; install it or IDL Assistant to use HTML help."))))) (error "browse-url is not available; install it or IDL Assistant to use HTML help")))))
(defvar idlwave-current-obj_new-class) (defvar idlwave-current-obj_new-class)
@ -828,7 +828,7 @@ see if a link is set for it. Try extra help functions if necessary."
;; Just a regular file name (+ anchor name) ;; Just a regular file name (+ anchor name)
(unless (and (stringp help-loc) (unless (and (stringp help-loc)
(file-directory-p help-loc)) (file-directory-p help-loc))
(error "Invalid help location.")) (error "Invalid help location"))
(setq full-link (browse-url-file-url (expand-file-name link help-loc))) (setq full-link (browse-url-file-url (expand-file-name link help-loc)))
;; Select the browser ;; Select the browser
@ -1320,7 +1320,7 @@ IDL assistant.")
(if (string-match "\.html" link) (if (string-match "\.html" link)
(setq topic (substring link 0 (match-beginning 0)) (setq topic (substring link 0 (match-beginning 0))
anchor (substring link (match-end 0))) anchor (substring link (match-end 0)))
(error "Malformed help link.")) (error "Malformed help link"))
(setq file (expand-file-name (concat topic ".html") help-loc)) (setq file (expand-file-name (concat topic ".html") help-loc))
(if (file-exists-p file) (if (file-exists-p file)

View file

@ -241,13 +241,13 @@ to set this option to nil."
(defcustom idlwave-shell-file-name-chars "~/A-Za-z0-9+:_.$#%={}\\- " (defcustom idlwave-shell-file-name-chars "~/A-Za-z0-9+:_.$#%={}\\- "
"The characters allowed in file names, as a string. "The characters allowed in file names, as a string.
Used for file name completion. Must not contain `'', `,' and `\"' Used for file name completion. Must not contain `'', `,' and `\"'
because these are used as separators by IDL." because these are used as separators by IDL."
:group 'idlwave-shell-general-setup :group 'idlwave-shell-general-setup
:type 'string) :type 'string)
(defcustom idlwave-shell-mode-hook '() (defcustom idlwave-shell-mode-hook '()
"*Hook for customising `idlwave-shell-mode'." "*Hook for customizing `idlwave-shell-mode'."
:group 'idlwave-shell-general-setup :group 'idlwave-shell-general-setup
:type 'hook) :type 'hook)
@ -339,7 +339,7 @@ expression being examined."
"*OBSOLETE VARIABLE, is no longer used.") "*OBSOLETE VARIABLE, is no longer used.")
(defcustom idlwave-shell-separate-examine-output t (defcustom idlwave-shell-separate-examine-output t
"*Non-nil mean, put output of examine commands in their own buffer." "*Non-nil means, put output of examine commands in their own buffer."
:group 'idlwave-shell-command-setup :group 'idlwave-shell-command-setup
:type 'boolean) :type 'boolean)
@ -444,7 +444,7 @@ popup help text on the line."
;; Breakpoint Overlays etc ;; Breakpoint Overlays etc
(defgroup idlwave-shell-highlighting-and-faces nil (defgroup idlwave-shell-highlighting-and-faces nil
"Highlighting and Faces used by the IDLWAVE Shell mode." "Highlighting and faces used by the IDLWAVE Shell mode."
:prefix "idlwave-shell" :prefix "idlwave-shell"
:group 'idlwave) :group 'idlwave)
@ -521,7 +521,7 @@ t Glyph when possible, otherwise face (same effect as 'glyph)."
(const :tag "Glyph or face." t))) (const :tag "Glyph or face." t)))
(defvar idlwave-shell-use-breakpoint-glyph t (defvar idlwave-shell-use-breakpoint-glyph t
"Obsolete variable. See `idlwave-shell-mark-breakpoints.") "Obsolete variable. See `idlwave-shell-mark-breakpoints'.")
(defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp (defcustom idlwave-shell-breakpoint-face 'idlwave-shell-bp
"*The face for breakpoint lines in the source code. "*The face for breakpoint lines in the source code.
@ -640,7 +640,7 @@ the directory stack.")
"The command which gets !PATH and !DIR info from the shell.") "The command which gets !PATH and !DIR info from the shell.")
(defvar idlwave-shell-mode-line-info nil (defvar idlwave-shell-mode-line-info nil
"Additional info displayed in the mode line") "Additional info displayed in the mode line.")
(defvar idlwave-shell-default-directory nil (defvar idlwave-shell-default-directory nil
"The default directory in the idlwave-shell buffer, of outside use.") "The default directory in the idlwave-shell buffer, of outside use.")
@ -722,7 +722,7 @@ the directory stack.")
(defvar idlwave-shell-bp-query "help,/breakpoints" (defvar idlwave-shell-bp-query "help,/breakpoints"
"Command to obtain list of breakpoints") "Command to obtain list of breakpoints.")
(defvar idlwave-shell-command-output nil (defvar idlwave-shell-command-output nil
"String for accumulating current command output.") "String for accumulating current command output.")
@ -733,11 +733,10 @@ The current command is finished when the IDL prompt is displayed.
This is evaluated if it is a list or called with funcall.") This is evaluated if it is a list or called with funcall.")
(defvar idlwave-shell-sentinel-hook nil (defvar idlwave-shell-sentinel-hook nil
"Hook run when the idl process exits.") "Hook run when the IDL process exits.")
(defvar idlwave-shell-hide-output nil (defvar idlwave-shell-hide-output nil
"If non-nil the process output is not inserted into the output "If non-nil the process output is not inserted into the output buffer.")
buffer.")
(defvar idlwave-shell-show-if-error nil (defvar idlwave-shell-show-if-error nil
"If non-nil the process output is inserted into the output buffer if "If non-nil the process output is inserted into the output buffer if
@ -754,12 +753,12 @@ it contains an error message, even if hide-output is non-nil.")
"List of commands to be sent to IDL. "List of commands to be sent to IDL.
Each element of the list is list of \(CMD PCMD HIDE\), where CMD is a Each element of the list is list of \(CMD PCMD HIDE\), where CMD is a
string to be sent to IDL and PCMD is a post-command to be placed on string to be sent to IDL and PCMD is a post-command to be placed on
`idlwave-shell-post-command-hook'. If HIDE is non-nil, hide the output `idlwave-shell-post-command-hook'. If HIDE is non-nil, hide the output
from command CMD. PCMD and HIDE are optional.") from command CMD. PCMD and HIDE are optional.")
(defun idlwave-shell-buffer () (defun idlwave-shell-buffer ()
"Name of buffer associated with IDL process. "Name of buffer associated with IDL process.
The name of the buffer is made by surrounding `idlwave-shell-process-name The name of the buffer is made by surrounding `idlwave-shell-process-name'
with `*'s." with `*'s."
(concat "*" idlwave-shell-process-name "*")) (concat "*" idlwave-shell-process-name "*"))
@ -792,7 +791,7 @@ IDL is currently stopped.")
(defconst idlwave-shell-halt-messages-re (defconst idlwave-shell-halt-messages-re
(mapconcat 'identity idlwave-shell-halt-messages "\\|") (mapconcat 'identity idlwave-shell-halt-messages "\\|")
"The regular expression computed from idlwave-shell-halt-messages") "The regular expression computed from `idlwave-shell-halt-messages'.")
(defconst idlwave-shell-trace-message-re (defconst idlwave-shell-trace-message-re
"^% At " ;; First line of a trace message "^% At " ;; First line of a trace message
@ -873,8 +872,8 @@ IDL has currently stepped.")
----------------- -----------------
RET after the end of the process' output sends the text from the RET after the end of the process' output sends the text from the
end of process to the end of the current line. RET before end of end of process to the end of the current line. RET before end of
process output copies the current line (except for the prompt) to the process output copies the current line (except for the prompt) to
end of the buffer. the end of the buffer.
Command history, searching of previous commands, command line Command history, searching of previous commands, command line
editing are available via the comint-mode key bindings, by default editing are available via the comint-mode key bindings, by default
@ -1126,9 +1125,9 @@ IDL has currently stepped.")
(fset 'idl-shell 'idlwave-shell)) (fset 'idl-shell 'idlwave-shell))
(defvar idlwave-shell-idl-wframe nil (defvar idlwave-shell-idl-wframe nil
"Frame for displaying the idl shell window.") "Frame for displaying the IDL shell window.")
(defvar idlwave-shell-display-wframe nil (defvar idlwave-shell-display-wframe nil
"Frame for displaying the idl source files.") "Frame for displaying the IDL source files.")
(defvar idlwave-shell-calling-stack-index 0) (defvar idlwave-shell-calling-stack-index 0)
(defvar idlwave-shell-calling-stack-routine nil) (defvar idlwave-shell-calling-stack-routine nil)
@ -1271,9 +1270,9 @@ Return either nil or 'hide."
show-if-error) show-if-error)
"Send a command to IDL process. "Send a command to IDL process.
\(CMD PCMD HIDE\) are placed at the end of ` \(CMD PCMD HIDE\) are placed at the end of `idlwave-shell-pending-commands'.
idlwave-shell-pending-commands'. If IDL is ready the first command, If IDL is ready the first command in `idlwave-shell-pending-commands',
CMD, in `idlwave-shell-pending-commands' is sent to the IDL process. CMD, is sent to the IDL process.
If optional second argument PCMD is non-nil it will be placed on If optional second argument PCMD is non-nil it will be placed on
`idlwave-shell-post-command-hook' when CMD is executed. `idlwave-shell-post-command-hook' when CMD is executed.
@ -1287,7 +1286,7 @@ stepping through code with output.
If optional fourth argument PREEMPT is non-nil CMD is put at front of If optional fourth argument PREEMPT is non-nil CMD is put at front of
`idlwave-shell-pending-commands'. If PREEMPT is 'wait, wait for all `idlwave-shell-pending-commands'. If PREEMPT is 'wait, wait for all
output to complete and the next prompt to arrive before returning output to complete and the next prompt to arrive before returning
\(useful if you need an answer now\). IDL is considered ready if the \(useful if you need an answer now\). IDL is considered ready if the
prompt is present and if `idlwave-shell-ready' is non-nil. prompt is present and if `idlwave-shell-ready' is non-nil.
If SHOW-IF-ERROR is non-nil, show the output if it contains an error If SHOW-IF-ERROR is non-nil, show the output if it contains an error
@ -1609,7 +1608,7 @@ and then calls `idlwave-shell-send-command' for any pending commands."
idlwave-shell-post-command-hook nil idlwave-shell-post-command-hook nil
idlwave-shell-hide-output nil idlwave-shell-hide-output nil
idlwave-shell-show-if-error nil)) idlwave-shell-show-if-error nil))
;; Done with post command. Do pending command if ;; Done with post command. Do pending command if
;; any. ;; any.
(idlwave-shell-send-command))) (idlwave-shell-send-command)))
(store-match-data data))))) (store-match-data data)))))
@ -1654,7 +1653,7 @@ and then calls `idlwave-shell-send-command' for any pending commands."
(defvar idlwave-shell-syntax-error (defvar idlwave-shell-syntax-error
"^% Syntax error.\\s-*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)" "^% Syntax error.\\s-*\n\\s-*At:\\s-*\\(.*\\),\\s-*Line\\s-*\\(.*\\)"
"A regular expression to match an IDL syntax error. "A regular expression to match an IDL syntax error.
The 1st pair matches the file name, the second pair matches the line The first pair matches the file name, the second pair matches the line
number.") number.")
(defvar idlwave-shell-other-error (defvar idlwave-shell-other-error
@ -1697,13 +1696,14 @@ in IDL5 which inserts random linebreaks in long module and file names.")
(defvar idlwave-shell-electric-debug-mode) ; defined by easy-mmode (defvar idlwave-shell-electric-debug-mode) ; defined by easy-mmode
(defun idlwave-shell-scan-for-state () (defun idlwave-shell-scan-for-state ()
"Scan for state info. Looks for messages in output from last IDL "Scan for state info.
command indicating where IDL has stopped. The types of messages we are Looks for messages in output from last IDL command indicating where
interested in are execution halted, stepped, breakpoint, interrupted IDL has stopped. The types of messages we are interested in are
at and trace messages. For breakpoint messages process any attached execution halted, stepped, breakpoint, interrupted at and trace
count or command parameters. Update the stop line if a message is messages. For breakpoint messages process any attached count or
found. The variable `idlwave-shell-current-state' is set to 'error, command parameters. Update the stop line if a message is found.
'halt, or 'breakpoint, which describes the status, or nil for none of The variable `idlwave-shell-current-state' is set to 'error, 'halt,
or 'breakpoint, which describes the status, or nil for none of
the above." the above."
(let (trace) (let (trace)
(cond (cond
@ -1936,7 +1936,7 @@ Also get rid of widget events in the queue."
(idlwave-shell-hide-p 'misc) nil t)) (idlwave-shell-hide-p 'misc) nil t))
(defun idlwave-shell-quit (&optional arg) (defun idlwave-shell-quit (&optional arg)
"Exit the idl process after confirmation. "Exit the IDL process after confirmation.
With prefix ARG, exit without confirmation." With prefix ARG, exit without confirmation."
(interactive "P") (interactive "P")
(if (not (idlwave-shell-is-running)) (if (not (idlwave-shell-is-running))
@ -2222,7 +2222,7 @@ args of an executive .run, .rnew or .compile."
(memq (preceding-char) '(?\' ?\"))))) (memq (preceding-char) '(?\' ?\")))))
(defun idlwave-shell-batch-command () (defun idlwave-shell-batch-command ()
"Returns t if we're in a batch command statement like @foo" "Return t if we're in a batch command statement like @foo"
(let ((limit (save-excursion (beginning-of-line) (point)))) (let ((limit (save-excursion (beginning-of-line) (point))))
(save-excursion (save-excursion
;; Skip backwards over filename ;; Skip backwards over filename
@ -2231,7 +2231,7 @@ args of an executive .run, .rnew or .compile."
(and (eq (preceding-char) ?@) (not (idlwave-in-quote)))))) (and (eq (preceding-char) ?@) (not (idlwave-in-quote))))))
(defun idlwave-shell-shell-command () (defun idlwave-shell-shell-command ()
"Returns t if we're in a shell command statement like $ls" "Return t if we're in a shell command statement like $ls"
(save-excursion (save-excursion
(idlwave-beginning-of-statement) (idlwave-beginning-of-statement)
(looking-at "\\$"))) (looking-at "\\$")))
@ -2239,7 +2239,7 @@ args of an executive .run, .rnew or .compile."
;; Debugging Commands ------------------------------------------------------ ;; Debugging Commands ------------------------------------------------------
(defun idlwave-shell-redisplay (&optional hide) (defun idlwave-shell-redisplay (&optional hide)
"Tries to resync the display with where execution has stopped. "Try to resync the display with where execution has stopped.
Issues a \"help,/trace\" command followed by a call to Issues a \"help,/trace\" command followed by a call to
`idlwave-shell-display-line'. Also updates the breakpoint `idlwave-shell-display-line'. Also updates the breakpoint
overlays." overlays."
@ -2309,8 +2309,8 @@ overlays."
(defun idlwave-shell-goto-frame (&optional frame) (defun idlwave-shell-goto-frame (&optional frame)
"Set buffer to FRAME with point at the frame line. "Set buffer to FRAME with point at the frame line.
If the optional argument FRAME is nil then idlwave-shell-pc-frame is If the optional argument FRAME is nil then `idlwave-shell-pc-frame'
used. Does nothing if the resulting frame is nil." is used. Does nothing if the resulting frame is nil."
(if frame () (if frame ()
(setq frame (idlwave-shell-pc-frame))) (setq frame (idlwave-shell-pc-frame)))
(cond (cond
@ -2321,7 +2321,7 @@ used. Does nothing if the resulting frame is nil."
(forward-line (1- (nth 1 frame)))))) (forward-line (1- (nth 1 frame))))))
(defun idlwave-shell-pc-frame () (defun idlwave-shell-pc-frame ()
"Returns the frame for IDL execution." "Return the frame for IDL execution."
(and idlwave-shell-halt-frame (and idlwave-shell-halt-frame
(list (nth 0 idlwave-shell-halt-frame) (list (nth 0 idlwave-shell-halt-frame)
(nth 1 idlwave-shell-halt-frame) (nth 1 idlwave-shell-halt-frame)
@ -2341,13 +2341,13 @@ used. Does nothing if the resulting frame is nil."
(defvar idlwave-shell-suppress-electric-debug nil) (defvar idlwave-shell-suppress-electric-debug nil)
(defun idlwave-shell-display-line (frame &optional col debug) (defun idlwave-shell-display-line (frame &optional col debug)
"display frame file in other window with overlay arrow. "Display frame file in other window with overlay arrow.
frame is a list of file name, line number, and subroutine name. if FRAME is a list of file name, line number, and subroutine name. If
frame is nil then remove overlay. if col is set, move point to that FRAME is nil then remove overlay. If COL is set, move point to that
column in the line. if debug is non-nil, enable the electric debug column in the line. If DEBUG is non-nil, enable the electric debug
mode. if it is 'disable, do not enable no matter what the setting of mode. If it is 'disable, do not enable no matter what the setting of
'idlwave-shell-automatic-electric-debug'. if it is 'force, enable no `idlwave-shell-automatic-electric-debug'. If it is 'force, enable no
matter what the settings of that variable." matter what the settings of that variable."
(if (not frame) (if (not frame)
;; remove stop-line overlay from old position ;; remove stop-line overlay from old position
@ -2449,7 +2449,8 @@ matter what the settings of that variable."
(defun idlwave-shell-step (arg) (defun idlwave-shell-step (arg)
"Step one source line. If given prefix argument ARG, step ARG source lines." "Step one source line.
If given prefix argument ARG, step ARG source lines."
(interactive "p") (interactive "p")
(or (not arg) (< arg 1) (or (not arg) (< arg 1)
(setq arg 1)) (setq arg 1))
@ -2474,14 +2475,14 @@ Uses IDL's stepover executive command which does not enter called functions."
no-show) no-show)
"Set breakpoint at current line. "Set breakpoint at current line.
If Count is nil then an ordinary breakpoint is set. We treat a count If COUNT is nil then an ordinary breakpoint is set. We treat a COUNT
of 1 as a temporary breakpoint using the ONCE keyword. Counts greater of 1 as a temporary breakpoint using the ONCE keyword. Counts greater
than 1 use the IDL AFTER=count keyword to break only after reaching than 1 use the IDL AFTER=count keyword to break only after reaching
the statement count times. the statement COUNT times.
Optional argument CMD is a list or function to evaluate upon reaching Optional argument CMD is a list or function to evaluate upon reaching
the breakpoint. CONDITION is a break condition, and DISABLED, if the breakpoint. CONDITION is a break condition, and DISABLED, if
non-nil disables the breakpoint" non-nil disables the breakpoint."
(interactive "P") (interactive "P")
(when (listp count) (when (listp count)
(if (equal (car count) 4) (if (equal (car count) 4)
@ -2616,8 +2617,8 @@ Returns nil if unable to obtain a module name."
(defun idlwave-shell-clear-current-bp () (defun idlwave-shell-clear-current-bp ()
"Remove breakpoint at current line. "Remove breakpoint at current line.
This command can be called from the shell buffer if IDL is currently stopped This command can be called from the shell buffer if IDL is currently
at a breakpoint." stopped at a breakpoint."
(interactive) (interactive)
(let ((bp (idlwave-shell-find-current-bp))) (let ((bp (idlwave-shell-find-current-bp)))
(if bp (idlwave-shell-clear-bp bp)))) (if bp (idlwave-shell-clear-bp bp))))
@ -2692,8 +2693,8 @@ in the current routine."
(defun idlwave-shell-set-bp-in-module (name type class) (defun idlwave-shell-set-bp-in-module (name type class)
"Set breakpoint in module. Assumes that `idlwave-shell-sources-alist' "Set breakpoint in module.
contains an entry for that module." Assumes that `idlwave-shell-sources-alist' contains an entry for that module."
(let* ((module (idlwave-make-full-name class name)) (let* ((module (idlwave-make-full-name class name))
(source-file (source-file
(car-safe (cdr-safe (car-safe (cdr-safe
@ -2839,17 +2840,17 @@ Runs to the last statement and then steps 1 statement. Use the .out command."
;;; End terrible hack section ;;; End terrible hack section
(defun idlwave-shell-mouse-print (event) (defun idlwave-shell-mouse-print (event)
"Print value of variable at the mouse position, with `help'" "Print value of variable at the mouse position, with `print'."
(interactive "e") (interactive "e")
(funcall (idlwave-shell-mouse-examine nil) event)) (funcall (idlwave-shell-mouse-examine nil) event))
(defun idlwave-shell-mouse-help (event) (defun idlwave-shell-mouse-help (event)
"Print value of variable at the mouse position, with `print'." "Print value of variable at the mouse position, with `help'."
(interactive "e") (interactive "e")
(funcall (idlwave-shell-mouse-examine 'help) event)) (funcall (idlwave-shell-mouse-examine 'help) event))
(defun idlwave-shell-examine-select (event) (defun idlwave-shell-examine-select (event)
"Pop-up a list to select from for examining the expression" "Pop-up a list to select from for examining the expression."
(interactive "e") (interactive "e")
(funcall (idlwave-shell-mouse-examine nil event) event)) (funcall (idlwave-shell-mouse-examine nil event) event))
@ -2880,7 +2881,7 @@ An expression is an identifier plus 1 pair of matched parentheses
directly following the identifier - an array or function call. directly following the identifier - an array or function call.
Alternatively, an expression is the contents of any matched Alternatively, an expression is the contents of any matched
parentheses when the open parenthesis is not directly preceded by an parentheses when the open parenthesis is not directly preceded by an
identifier. If point is at the beginning or within an expression identifier. If point is at the beginning or within an expression
return the inner-most containing expression, otherwise, return the return the inner-most containing expression, otherwise, return the
preceding expression. preceding expression.
@ -2890,9 +2891,9 @@ use the current region as the expression.
With double prefix arg ARG prompt for an expression. With double prefix arg ARG prompt for an expression.
If EV is a valid event passed, pop-up a list from If EV is a valid event passed, pop-up a list from
idlw-shell-examine-alist from which to select the help command text. `idlwave-shell-examine-alist' from which to select the help
If instead COMPLETE-HELP-TYPE is non-nil, choose from command text. If instead COMPLETE-HELP-TYPE is non-nil, choose
idlw-shell-examine-alist via mini-buffer shortcut key." from `idlwave-shell-examine-alist' via mini-buffer shortcut key."
(interactive "P") (interactive "P")
;; For speed: assume the helper routine hasn't been lost, e.g. with ;; For speed: assume the helper routine hasn't been lost, e.g. with
@ -3271,7 +3272,7 @@ Remaining elements of the cdr:
data - Data associated with the breakpoint by idlwave-shell currently data - Data associated with the breakpoint by idlwave-shell currently
contains four items: contains four items:
count - number of times to execute breakpoint. When count reaches 0 count - number of times to execute breakpoint. When count reaches 0
the breakpoint is cleared and removed from the alist. the breakpoint is cleared and removed from the alist.
command - command to execute when breakpoint is reached, either a command - command to execute when breakpoint is reached, either a
@ -3280,16 +3281,16 @@ command - command to execute when breakpoint is reached, either a
condition - any condition to apply to the breakpoint. condition - any condition to apply to the breakpoint.
disabled - whether the bp is disabled") disabled - whether the bp is disabled.")
(defun idlwave-shell-run-region (beg end &optional n) (defun idlwave-shell-run-region (beg end &optional n)
"Compile and run the region using the IDL process. "Compile and run the region using the IDL process.
Copies the region to a temporary file `idlwave-shell-temp-pro-file' Copies the region to a temporary file `idlwave-shell-temp-pro-file'
and issues the IDL .run command for the file. Because the and issues the IDL .run command for the file. Because the region
region is compiled and run as a main program there is no is compiled and run as a main program there is no problem with
problem with begin-end blocks extending over multiple begin-end blocks extending over multiple lines - which would be
lines - which would be a problem if `idlwave-shell-evaluate-region' a problem if `idlwave-shell-evaluate-region' was used.
was used. An END statement is appended to the region if necessary. An END statement is appended to the region if necessary.
If there is a prefix argument, display IDL process." If there is a prefix argument, display IDL process."
(interactive "r\nP") (interactive "r\nP")
@ -3378,12 +3379,12 @@ Queries IDL using the string in `idlwave-shell-bp-query'."
'hide)) 'hide))
(defun idlwave-shell-bp-get (bp &optional item) (defun idlwave-shell-bp-get (bp &optional item)
"Get a value for a breakpoint. BP has the form of elements in "Get a value for a breakpoint.
idlwave-shell-bp-alist. Optional second arg ITEM is the BP has the form of elements in `idlwave-shell-bp-alist'.
particular value to retrieve. ITEM can be 'file, 'line, 'index, Optional second arg ITEM is the particular value to retrieve.
'module, 'count, 'cmd, 'condition, 'disabled, 'type, or ITEM can be 'file, 'line, 'index, 'module, 'count, 'cmd,
'data. 'data returns a list of 'count, 'cmd and 'condition. 'condition, 'disabled, 'type, or 'data. 'data returns a list
Defaults to 'index." of 'count, 'cmd and 'condition. Defaults to 'index."
(cond (cond
;; Frame ;; Frame
((eq item 'line) (nth 1 (car bp))) ((eq item 'line) (nth 1 (car bp)))
@ -3405,10 +3406,10 @@ Defaults to 'index."
(t (nth 0 (car (cdr bp)))))) (t (nth 0 (car (cdr bp))))))
(defun idlwave-shell-filter-bp (&optional no-show) (defun idlwave-shell-filter-bp (&optional no-show)
"Get the breakpoints from `idlwave-shell-command-output'. Create "Get the breakpoints from `idlwave-shell-command-output'.
`idlwave-shell-bp-alist' updating breakpoint count and command data Create `idlwave-shell-bp-alist' updating breakpoint count and command
from previous breakpoint list. If NO-SHOW is set, don't update the data from previous breakpoint list. If NO-SHOW is set, don't update
breakpoint overlays." the breakpoint overlays."
(save-excursion (save-excursion
(set-buffer (get-buffer-create idlwave-shell-bp-buffer)) (set-buffer (get-buffer-create idlwave-shell-bp-buffer))
(erase-buffer) (erase-buffer)
@ -3489,10 +3490,11 @@ If BP frame is in `idlwave-shell-bp-alist' updates the breakpoint data."
(setcdr (cdr bp) data)) (setcdr (cdr bp) data))
(defun idlwave-shell-bp (frame &optional data module) (defun idlwave-shell-bp (frame &optional data module)
"Create a breakpoint structure containing FRAME and DATA. Second "Create a breakpoint structure containing FRAME and DATA.
and third args, DATA and MODULE, are optional. Returns a breakpoint Second and third args, DATA and MODULE, are optional. Returns
of the format used in `idlwave-shell-bp-alist'. Can be used in commands a breakpoint of the format used in `idlwave-shell-bp-alist'.
attempting match a breakpoint in `idlwave-shell-bp-alist'." Can be used in commands attempting match a breakpoint in
`idlwave-shell-bp-alist'."
(cons frame ;; (file line) (cons frame ;; (file line)
(cons (list nil module) ;; (index_id (module type) | module) (cons (list nil module) ;; (index_id (module type) | module)
data))) ;; (count command condition disabled) data))) ;; (count command condition disabled)
@ -3503,7 +3505,7 @@ attempting match a breakpoint in `idlwave-shell-bp-alist'."
(defun idlwave-shell-sources-bp (bp) (defun idlwave-shell-sources-bp (bp)
"Check `idlwave-shell-sources-alist' for source of breakpoint using BP. "Check `idlwave-shell-sources-alist' for source of breakpoint using BP.
If an equivalency is found, return the IDL internal source name. If an equivalency is found, return the IDL internal source name.
Otherwise return the filename in bp." Otherwise return the filename in BP."
(let* (let*
((bp-file (idlwave-shell-bp-get bp 'file)) ((bp-file (idlwave-shell-bp-get bp 'file))
(bp-module (idlwave-shell-bp-get bp 'module)) (bp-module (idlwave-shell-bp-get bp 'module))
@ -3621,7 +3623,7 @@ considered the new breakpoint if the file name of frame matches."
(message "Failed to identify breakpoint in IDL")))) (message "Failed to identify breakpoint in IDL"))))
(defvar idlwave-shell-bp-overlays nil (defvar idlwave-shell-bp-overlays nil
"Alist of overlays marking breakpoints") "Alist of overlays marking breakpoints.")
(defvar idlwave-shell-bp-glyph) (defvar idlwave-shell-bp-glyph)
(defvar idlwave-shell-debug-line-map (make-sparse-keymap)) (defvar idlwave-shell-debug-line-map (make-sparse-keymap))
@ -3952,7 +3954,7 @@ handled by this command."
"Alist of IDL procedure names and compiled source files. "Alist of IDL procedure names and compiled source files.
Elements of the alist have the form: Elements of the alist have the form:
(module name . (source-file-truename idlwave-internal-filename)).") (module name . (source-file-truename idlwave-internal-filename))")
(defun idlwave-shell-module-source-query (module &optional type) (defun idlwave-shell-module-source-query (module &optional type)
"Determine the source file for a given module. "Determine the source file for a given module.
@ -3965,7 +3967,7 @@ Query as a function if TYPE set to something beside 'pro."
'hide 'wait))) 'hide 'wait)))
(defun idlwave-shell-module-source-filter (module) (defun idlwave-shell-module-source-filter (module)
"Get module source, and update idlwave-shell-sources-alist." "Get module source, and update `idlwave-shell-sources-alist'."
(let ((old (assoc (upcase module) idlwave-shell-sources-alist)) (let ((old (assoc (upcase module) idlwave-shell-sources-alist))
filename) filename)
(when (string-match "\.PATH *[\n\r]\\([^%][^\r\n]+\\)[\n\r]" (when (string-match "\.PATH *[\n\r]\\([^%][^\r\n]+\\)[\n\r]"
@ -3990,9 +3992,9 @@ Queries IDL using the string in `idlwave-shell-sources-query'."
(defun idlwave-shell-sources-filter () (defun idlwave-shell-sources-filter ()
"Get source files from `idlwave-shell-sources-query' output. "Get source files from `idlwave-shell-sources-query' output.
Create `idlwave-shell-sources-alist' consisting of Create `idlwave-shell-sources-alist' consisting of list elements
list elements of the form: of the form:
(module name . (source-file-truename idlwave-internal-filename))." (module name . (source-file-truename idlwave-internal-filename))"
(save-excursion (save-excursion
(set-buffer (get-buffer-create idlwave-shell-bp-buffer)) (set-buffer (get-buffer-create idlwave-shell-bp-buffer))
(erase-buffer) (erase-buffer)
@ -4108,7 +4110,7 @@ Otherwise, just expand the file name."
;; Keybindings ------------------------------------------------------------ ;; Keybindings ------------------------------------------------------------
(defvar idlwave-shell-mode-map (copy-keymap comint-mode-map) (defvar idlwave-shell-mode-map (copy-keymap comint-mode-map)
"Keymap for idlwave-mode.") "Keymap for `idlwave-mode'.")
(defvar idlwave-shell-electric-debug-mode-map (make-sparse-keymap)) (defvar idlwave-shell-electric-debug-mode-map (make-sparse-keymap))
(defvar idlwave-shell-mode-prefix-map (make-sparse-keymap)) (defvar idlwave-shell-mode-prefix-map (make-sparse-keymap))
(fset 'idlwave-shell-mode-prefix-map idlwave-shell-mode-prefix-map) (fset 'idlwave-shell-mode-prefix-map idlwave-shell-mode-prefix-map)
@ -4345,7 +4347,7 @@ idlwave-shell-electric-debug-mode-map)
;; easy-mmode defines electric-debug-mode for us, so we need to advise it. ;; easy-mmode defines electric-debug-mode for us, so we need to advise it.
(defadvice idlwave-shell-electric-debug-mode (after print-enter activate) (defadvice idlwave-shell-electric-debug-mode (after print-enter activate)
"Print out an entrance message" "Print out an entrance message."
(when idlwave-shell-electric-debug-mode (when idlwave-shell-electric-debug-mode
(message (message
"Electric Debugging mode entered. Press [C-?] for help, [q] to quit")) "Electric Debugging mode entered. Press [C-?] for help, [q] to quit"))
@ -4695,9 +4697,9 @@ static char * file[] = {
;;; Load the toolbar when wanted by the user. ;;; Load the toolbar when wanted by the user.
(autoload 'idlwave-toolbar-toggle "idlw-toolbar" (autoload 'idlwave-toolbar-toggle "idlw-toolbar"
"Toggle the IDLWAVE toolbar") "Toggle the IDLWAVE toolbar.")
(autoload 'idlwave-toolbar-add-everywhere "idlw-toolbar" (autoload 'idlwave-toolbar-add-everywhere "idlw-toolbar"
"Add IDLWAVE toolbar") "Add IDLWAVE toolbar.")
(defun idlwave-shell-toggle-toolbar () (defun idlwave-shell-toggle-toolbar ()
"Toggle the display of the debugging toolbar." "Toggle the display of the debugging toolbar."
(interactive) (interactive)

File diff suppressed because it is too large Load diff

View file

@ -214,7 +214,7 @@ buffer with \\[set-variable].")
;;;###autoload ;;;###autoload
(defvar inferior-lisp-mode-hook '() (defvar inferior-lisp-mode-hook '()
"*Hook for customising Inferior Lisp mode.") "*Hook for customizing Inferior Lisp mode.")
(put 'inferior-lisp-mode 'mode-class 'special) (put 'inferior-lisp-mode 'mode-class 'special)

View file

@ -5881,7 +5881,7 @@ XSTART YSTART are the relative position for the first page in a sheet.")
(ps-get-page-dimensions) (ps-get-page-dimensions)
;; final check ;; final check
(unless (listp ps-lpr-switches) (unless (listp ps-lpr-switches)
(error "`ps-lpr-switches' value should be a list.")) (error "`ps-lpr-switches' value should be a list"))
(and ps-color-p (and ps-color-p
(equal ps-default-background ps-default-foreground) (equal ps-default-background ps-default-foreground)
(error (error

View file

@ -355,7 +355,7 @@ Thus, this does not include the shell's current directory.")
'complete-expand))) 'complete-expand)))
(defcustom shell-mode-hook '() (defcustom shell-mode-hook '()
"Hook for customising Shell mode." "Hook for customizing Shell mode."
:type 'hook :type 'hook
:group 'shell) :group 'shell)

View file

@ -216,7 +216,7 @@ If value of `bibtex-maintain-sorted-entries' is `entry-class'
entries are ordered according to the classes they belong to. Each entries are ordered according to the classes they belong to. Each
class contains a list of entry types. An entry `catch-all' applies class contains a list of entry types. An entry `catch-all' applies
to all entries not explicitly mentioned." to all entries not explicitly mentioned."
:group 'BibTeX :group 'bibtex
:type '(repeat (choice :tag "Class" :type '(repeat (choice :tag "Class"
(const :tag "catch-all" (catch-all)) (const :tag "catch-all" (catch-all))
(repeat :tag "Entry type" string)))) (repeat :tag "Entry type" string))))

View file

@ -938,7 +938,7 @@ Internal use.")
(defun ispell-find-aspell-dictionaries () (defun ispell-find-aspell-dictionaries ()
"Find Aspell's dictionaries, and record in `ispell-dictionary-alist'." "Find Aspell's dictionaries, and record in `ispell-dictionary-alist'."
(unless (and ispell-really-aspell ispell-encoding8-command) (unless (and ispell-really-aspell ispell-encoding8-command)
(error "This function only works with aspell >= 0.60.")) (error "This function only works with aspell >= 0.60"))
(let* ((dictionaries (let* ((dictionaries
(split-string (split-string
(with-temp-buffer (with-temp-buffer

View file

@ -675,7 +675,7 @@ promotion/demotion later."
(beginning-of-line 1) (beginning-of-line 1)
(if (looking-at reftex-section-regexp) (if (looking-at reftex-section-regexp)
(setq name (reftex-match-string 2)) (setq name (reftex-match-string 2))
(error "Something is wrong! Contact maintainer!"))) (error "Something is wrong! Contact maintainer!")))
;; Section has changed, request scan and loading ;; Section has changed, request scan and loading
;; We use a variable to delay until after the safe-exc. ;; We use a variable to delay until after the safe-exc.
;; because otherwise we loose the region. ;; because otherwise we loose the region.
@ -781,7 +781,7 @@ label prefix determines the wording of a reference."
(let* ((toc (get-text-property (point) :data)) (let* ((toc (get-text-property (point) :data))
(label (car toc)) newlabel) (label (car toc)) newlabel)
(if (not (stringp label)) (if (not (stringp label))
(error "This is not a label entry.")) (error "This is not a label entry"))
(setq newlabel (read-string (format "Rename label \"%s\" to:" label))) (setq newlabel (read-string (format "Rename label \"%s\" to:" label)))
(if (assoc newlabel (symbol-value reftex-docstruct-symbol)) (if (assoc newlabel (symbol-value reftex-docstruct-symbol))
(if (not (y-or-n-p (if (not (y-or-n-p

View file

@ -664,7 +664,7 @@ will properly intercept all attempts to toggle the read-only flag
on version-controlled buffer." on version-controlled buffer."
(interactive "P") (interactive "P")
(if (vc-backend buffer-file-name) (if (vc-backend buffer-file-name)
(error "Toggling the readability of a version controlled file is likely to wreak havoc.") (error "Toggling the readability of a version controlled file is likely to wreak havoc")
(toggle-read-only))) (toggle-read-only)))
(defun vc-default-make-version-backups-p (backend file) (defun vc-default-make-version-backups-p (backend file)

View file

@ -465,7 +465,7 @@ attempt the checkout for all registered files beneath it."
"Roll back, undoing the most recent checkins of FILES. Directories are "Roll back, undoing the most recent checkins of FILES. Directories are
expanded to all registered subfiles in them." expanded to all registered subfiles in them."
(if (not files) (if (not files)
(error "RCS backend doesn't support directory-level rollback.")) (error "RCS backend doesn't support directory-level rollback"))
(dolist (file (vc-expand-dirs files)) (dolist (file (vc-expand-dirs files))
(let* ((discard (vc-working-revision file)) (let* ((discard (vc-working-revision file))
(previous (if (vc-rcs-trunk-p discard) "" (vc-branch-part discard))) (previous (if (vc-rcs-trunk-p discard) "" (vc-branch-part discard)))

View file

@ -288,7 +288,7 @@ locked. REV is the revision to check out."
are expanded to all version-controlled subfiles." are expanded to all version-controlled subfiles."
(setq files (vc-expand-dirs files)) (setq files (vc-expand-dirs files))
(if (not files) (if (not files)
(error "SCCS backend doesn't support directory-level rollback.")) (error "SCCS backend doesn't support directory-level rollback"))
(dolist (file files) (dolist (file files)
(let ((discard (vc-working-revision file))) (let ((discard (vc-working-revision file)))
(if (null (yes-or-no-p (format "Remove version %s from %s history? " (if (null (yes-or-no-p (format "Remove version %s from %s history? "

View file

@ -941,7 +941,7 @@ current buffer."
(list (vc-responsible-backend (list (vc-responsible-backend
(file-name-directory (buffer-file-name))) (file-name-directory (buffer-file-name)))
(list buffer-file-name)))) (list buffer-file-name))))
(t (error "No fileset is available here."))))) (t (error "No fileset is available here")))))
(defun vc-ensure-vc-buffer () (defun vc-ensure-vc-buffer ()
"Make sure that the current buffer visits a version-controlled file." "Make sure that the current buffer visits a version-controlled file."
@ -1025,9 +1025,9 @@ merge in the changes into your working copy."
;; Do the right thing ;; Do the right thing
(cond (cond
((eq state 'missing) ((eq state 'missing)
(error "Fileset files are missing, so cannot be operated on.")) (error "Fileset files are missing, so cannot be operated on"))
((eq state 'ignored) ((eq state 'ignored)
(error "Fileset files are ignored by the version-control system.")) (error "Fileset files are ignored by the version-control system"))
((or (null state) (eq state 'unregistered)) ((or (null state) (eq state 'unregistered))
(vc-register nil vc-fileset)) (vc-register nil vc-fileset))
;; Files are up-to-date, or need a merge and user specified a revision ;; Files are up-to-date, or need a merge and user specified a revision
@ -1251,7 +1251,7 @@ first backend that could register the file is used."
"Register the current file with a specified back end." "Register the current file with a specified back end."
(interactive "SBackend: ") (interactive "SBackend: ")
(when (not (member backend vc-handled-backends)) (when (not (member backend vc-handled-backends))
(error "Unknown back end.")) (error "Unknown back end"))
(let ((vc-handled-backends (list backend))) (let ((vc-handled-backends (list backend)))
(call-interactively 'vc-register))) (call-interactively 'vc-register)))
@ -1574,7 +1574,7 @@ returns t if the buffer had changes, nil otherwise."
(list files rev1 rev2)))) (list files rev1 rev2))))
;; All that was just so we could do argument completion! ;; All that was just so we could do argument completion!
(when (and (not rev1) rev2) (when (and (not rev1) rev2)
(error "Not a valid revision range.")) (error "Not a valid revision range"))
;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the ;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the
;; placement rules for (interactive) don't actually leave us a choice. ;; placement rules for (interactive) don't actually leave us a choice.
(vc-diff-internal t (vc-deduce-fileset) rev1 rev2 (interactive-p))) (vc-diff-internal t (vc-deduce-fileset) rev1 rev2 (interactive-p)))
@ -1933,7 +1933,7 @@ to the working revision (except for keyword expansion)."
(dolist (file files) (dolist (file files)
(let ((buf (get-file-buffer file))) (let ((buf (get-file-buffer file)))
(when (and buf (buffer-modified-p buf)) (when (and buf (buffer-modified-p buf))
(error "Please kill or save all modified buffers before reverting."))) (error "Please kill or save all modified buffers before reverting")))
(when (vc-up-to-date-p file) (when (vc-up-to-date-p file)
(unless (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file)) (unless (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file))
(error "Revert canceled")))) (error "Revert canceled"))))
@ -1968,7 +1968,7 @@ depending on the underlying version-control system."
(error "Rollback requires a singleton fileset or repository versioning")) (error "Rollback requires a singleton fileset or repository versioning"))
;; FIXME: latest-on-branch-p should take the fileset. ;; FIXME: latest-on-branch-p should take the fileset.
(when (not (vc-call-backend backend 'latest-on-branch-p (car files))) (when (not (vc-call-backend backend 'latest-on-branch-p (car files)))
(error "Rollback is only possible at the tip revision.")) (error "Rollback is only possible at the tip revision"))
;; If any of the files is visited by the current buffer, make ;; If any of the files is visited by the current buffer, make
;; sure buffer is saved. If the user says `no', abort since ;; sure buffer is saved. If the user says `no', abort since
;; we cannot show the changes and ask for confirmation to ;; we cannot show the changes and ask for confirmation to
@ -1977,9 +1977,9 @@ depending on the underlying version-control system."
(vc-buffer-sync nil)) (vc-buffer-sync nil))
(dolist (file files) (dolist (file files)
(when (buffer-modified-p (get-file-buffer file)) (when (buffer-modified-p (get-file-buffer file))
(error "Please kill or save all modified buffers before rollback.")) (error "Please kill or save all modified buffers before rollback"))
(when (not (vc-up-to-date-p file)) (when (not (vc-up-to-date-p file))
(error "Please revert all modified workfiles before rollback."))) (error "Please revert all modified workfiles before rollback")))
;; Accumulate changes associated with the fileset ;; Accumulate changes associated with the fileset
(vc-setup-buffer "*vc-diff*") (vc-setup-buffer "*vc-diff*")
(not-modified) (not-modified)

View file

@ -677,7 +677,7 @@ OLD-WINDOW."
;; Not the only frame, so can safely be removed. ;; Not the only frame, so can safely be removed.
(if view-remove-frame-by-deleting (if view-remove-frame-by-deleting
(delete-frame frame) (delete-frame frame)
(setq notlost t) ; Keep the window. See below. (setq notlost t) ; Keep the window. See below.
(iconify-frame frame)))))))) (iconify-frame frame))))))))
;; If a frame is removed by iconifying it, the window is not ;; If a frame is removed by iconifying it, the window is not
;; really lost. In this case we keep the entry in ;; really lost. In this case we keep the entry in
@ -836,7 +836,7 @@ invocations return to earlier marks."
;; Scroll forward LINES lines. If BACKWARD is non-nil, scroll backwards. ;; Scroll forward LINES lines. If BACKWARD is non-nil, scroll backwards.
;; If LINES is negative scroll in the other direction. ;; If LINES is negative scroll in the other direction.
;; If LINES is 0 or nil, scroll DEFAULT lines (if DEFAULT is nil, scroll ;; If LINES is 0 or nil, scroll DEFAULT lines (if DEFAULT is nil, scroll
;; by one page). If MAXDEFAULT is non-nil, scroll no more than a window. ;; by one page). If MAXDEFAULT is non-nil, scroll no more than a window.
(if (or (null lines) (zerop (setq lines (prefix-numeric-value lines)))) (if (or (null lines) (zerop (setq lines (prefix-numeric-value lines))))
(setq lines default)) (setq lines default))
(when (and lines (< lines 0)) (when (and lines (< lines 0))
@ -931,7 +931,7 @@ See also `View-scroll-page-forward-set-page-size'."
(defun View-scroll-line-forward (&optional lines) (defun View-scroll-line-forward (&optional lines)
"Scroll forward one line (or prefix LINES lines) in View mode. "Scroll forward one line (or prefix LINES lines) in View mode.
See also `View-scroll-page-forward,' but note that scrolling is limited See also `View-scroll-page-forward', but note that scrolling is limited
to minimum of LINES and one window-full." to minimum of LINES and one window-full."
(interactive "P") (interactive "P")
(view-scroll-lines lines nil 1 t)) (view-scroll-lines lines nil 1 t))
@ -1032,8 +1032,8 @@ for highlighting the match that is found."
(defun view-search (times regexp) (defun view-search (times regexp)
;; This function does the job for all the View-search- commands. ;; This function does the job for all the View-search- commands.
;; Search for the TIMESt match for REGEXP. If TIMES is negative ;; Search for the TIMESt match for REGEXP. If TIMES is negative
;; search backwards. If REGEXP is nil use `view-last-regexp'. ;; search backwards. If REGEXP is nil use `view-last-regexp'.
;; Characters "!" and "@" have a special meaning at the beginning of ;; Characters "!" and "@" have a special meaning at the beginning of
;; REGEXP and are removed from REGEXP before the search "!" means ;; REGEXP and are removed from REGEXP before the search "!" means
;; search for lines with no match for REGEXP. "@" means search in ;; search for lines with no match for REGEXP. "@" means search in

View file

@ -486,7 +486,7 @@ non-nil means return old filename."
file-new "' failed:\n%s\n") file-new "' failed:\n%s\n")
err))))))))) err)))))))))
errors)) errors))
(defun wdired-exit () (defun wdired-exit ()
"Exit wdired and return to dired mode. "Exit wdired and return to dired mode.
@ -553,7 +553,7 @@ Optional arguments are ignored."
(if (and (if (and
(buffer-modified-p) (buffer-modified-p)
(not (y-or-n-p "Buffer changed. Discard changes and kill buffer? "))) (not (y-or-n-p "Buffer changed. Discard changes and kill buffer? ")))
(error "Error."))) (error "Error")))
(defun wdired-next-line (arg) (defun wdired-next-line (arg)
"Move down lines then position at filename or the current column. "Move down lines then position at filename or the current column.