From 8fc29035f39226e4c9154132fa57d57559ee4c22 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 14 Nov 2008 13:05:18 +0000 Subject: [PATCH] * w32-fns.el (w32-shell-dos-semantics): * calendar/diary-lib.el (diary-face-attrs): * international/mule-cmds.el (set-default-coding-systems) (prefer-coding-system): * net/tramp.el (tramp-set-completion-function): * progmodes/vhdl-mode.el (vhdl-file-header): * term/pc-win.el (msdos-show-help): Fix typos in docstrings. * emacs-lisp/authors.el (authors-fixed-entries): Fix typo in value. * files.el (enable-local-eval, not-modified, kill-buffer-ask) (kill-matching-buffers, save-buffers-kill-emacs) (save-buffers-kill-terminal): Fix typos in docstrings. (switch-to-buffer-other-window): Reflow docstring. (revert-buffer): Doc fix. (define-project-bindings): Rename arg LIST to SETTINGS. (project-find-settings-file): Use `let', not `let*'. Use `when'. --- lisp/ChangeLog | 21 ++++++++++++++++ lisp/calendar/diary-lib.el | 2 +- lisp/emacs-lisp/authors.el | 2 +- lisp/files.el | 44 ++++++++++++++++----------------- lisp/international/mule-cmds.el | 4 +-- lisp/net/tramp.el | 2 +- lisp/progmodes/vhdl-mode.el | 2 +- lisp/term/pc-win.el | 2 +- lisp/w32-fns.el | 2 +- src/ChangeLog | 6 +++++ src/dosfns.c | 2 +- src/msdos.c | 4 +-- 12 files changed, 60 insertions(+), 33 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a336a15d5..f0ae8992db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2008-11-14 Juanma Barranquero + + * w32-fns.el (w32-shell-dos-semantics): + * calendar/diary-lib.el (diary-face-attrs): + * international/mule-cmds.el (set-default-coding-systems) + (prefer-coding-system): + * net/tramp.el (tramp-set-completion-function): + * progmodes/vhdl-mode.el (vhdl-file-header): + * term/pc-win.el (msdos-show-help): Fix typos in docstrings. + + * emacs-lisp/authors.el (authors-fixed-entries): Fix typo in value. + + * files.el (enable-local-eval, not-modified, kill-buffer-ask) + (kill-matching-buffers, save-buffers-kill-emacs) + (save-buffers-kill-terminal): Fix typos in docstrings. + (switch-to-buffer-other-window): Reflow docstring. + (revert-buffer): Doc fix. + (define-project-bindings): Rename arg LIST to SETTINGS. + (project-find-settings-file): Use `let', not `let*'. + Use `when'. + 2008-11-13 Juanma Barranquero * files.el (project-settings-file, locate-dominating-file): diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 86ec36b4b6..d88144559e 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -106,7 +106,7 @@ is pre-pended to REGEXP for file-wide specifiers. ATTRIBUTE specifies which face attribute (e.g. `:foreground') to modify, or that this is a face (`:face') to apply. TYPE is the type of attribute being applied. Available TYPES (see `diary-attrtype-convert') -are: `string', `symbol', `int', `tnil',`stringtnil.'" +are: `string', `symbol', `int', `tnil', `stringtnil.'" :type '(repeat (list (string :tag "Regular expression") (integer :tag "Sub-expression") (symbol :tag "Attribute (e.g. :foreground)") diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index ce59a93839..8af755c093 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -273,7 +273,7 @@ Changes to files in this list are not listed.") ("Geoff Voelker" :wrote "src/makefile.nt" "lisp/makefile.nt" "winnt.el" "nt.c" "nt.h" "ntheap.c" "ntheap.h" "ntinevt.c" "ntproc.c" "ntterm.c" "windowsnt.h") - ("Morten Welinder" :wrote "dosfns.c" "[many MSDOS files]" "msdos.h") + ("Morten Welinder" :wrote "dosfns.c" "[many MS-DOS files]" "msdos.h") ("Pace Willisson" :wrote "ispell.el") ("Garrett Wollman" :changed "sendmail.el") ("Dale R. Worley" :changed "mail-extr.el") diff --git a/lisp/files.el b/lisp/files.el index 6c45abeb3e..ff6d184752 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -487,7 +487,7 @@ specified in a -*- line.") (defcustom enable-local-eval 'maybe "Control processing of the \"variable\" `eval' in a file's local variables. The value can be t, nil or something else. -A value of t means obey `eval' variables; +A value of t means obey `eval' variables. A value of nil means ignore them; anything else means query." :type '(choice (const :tag "Obey" t) (const :tag "Ignore" nil) @@ -1116,8 +1116,8 @@ creates a buffer with that name. When called from Lisp, BUFFER can be a buffer, a string \(a buffer name), or nil. If BUFFER is nil, then this function chooses a buffer using `other-buffer'. -Optional second arg NORECORD non-nil means -do not put this buffer at the front of the list of recently selected ones. +Optional second arg NORECORD non-nil means do not put this +buffer at the front of the list of recently selected ones. This function returns the buffer it switched to. This uses the function `display-buffer' as a subroutine; see its @@ -3167,11 +3167,11 @@ for a class are defined using `define-project-bindings'." (error "No such project class `%s'" (symbol-name class))) (push (cons directory class) project-directory-alist)) -(defun define-project-bindings (class list) +(defun define-project-bindings (class settings) "Map the project type CLASS to a list of variable settings. CLASS is the project class, a symbol. -LIST is a list that declares variable settings for the class. -An element in LIST is either of the form: +SETTINGS is a list that declares variable settings for the class. +An element in SETTINGS is either of the form: (MAJOR-MODE . ALIST) or (DIRECTORY . LIST) @@ -3199,8 +3199,8 @@ LIST. The list is processed in order. applied by recursively following these rules." (let ((elt (assq class project-class-alist))) (if elt - (setcdr elt list) - (push (cons class list) project-class-alist)))) + (setcdr elt settings) + (push (cons class settings) project-class-alist)))) (defcustom project-settings-file ".dir-settings.el" "Settings file for per-project settings. @@ -3219,11 +3219,11 @@ If the file is in a registered project, a cons from Otherwise this returns nil." (when project-settings-file (setq file (expand-file-name file)) - (let* ((settings (locate-dominating-file file project-settings-file)) - (pda nil)) + (let ((settings (locate-dominating-file file project-settings-file)) + (pda nil)) ;; `locate-dominating-file' may have abbreviated the name. - (if settings - (setq settings (expand-file-name project-settings-file settings))) + (when settings + (setq settings (expand-file-name project-settings-file settings))) (dolist (x project-directory-alist) (when (and (eq t (compare-strings file nil (length (car x)) (car x) nil nil)) @@ -4331,7 +4331,7 @@ change the additional actions you can take on files." (defun not-modified (&optional arg) "Mark current buffer as unmodified, not needing to be saved. -With prefix arg, mark buffer as modified, so \\[save-buffer] will save. +With prefix ARG, mark buffer as modified, so \\[save-buffer] will save. It is not a good idea to use this function in Lisp programs, because it prints a message in the minibuffer. Instead, use `set-buffer-modified-p'." @@ -4514,9 +4514,9 @@ that is more recent than the visited file. This command also implements an interface for special buffers that contain text which doesn't come from a file, but reflects some other data instead (e.g. Dired buffers, `buffer-list' -buffers). This is done via the variable -`revert-buffer-function'. In these cases, it should reconstruct -the buffer contents from the appropriate data. +buffers). This is done via the variable `revert-buffer-function'. +In these cases, it should reconstruct the buffer contents from the +appropriate data. When called from Lisp, the first argument is IGNORE-AUTO; only offer to revert from the auto-save file when this is nil. Note that the @@ -4524,8 +4524,8 @@ sense of this argument is the reverse of the prefix argument, for the sake of backward compatibility. IGNORE-AUTO is optional, defaulting to nil. -Optional second argument NOCONFIRM means don't ask for confirmation at -all. \(The variable `revert-without-query' offers another way to +Optional second argument NOCONFIRM means don't ask for confirmation +at all. \(The variable `revert-without-query' offers another way to revert buffers without querying for confirmation.) Optional third argument PRESERVE-MODES non-nil means don't alter @@ -4804,7 +4804,7 @@ This command is used in the special Dired buffer created by (kill-buffer buffer)))) (defun kill-buffer-ask (buffer) - "Kill buffer if confirmed." + "Kill BUFFER if confirmed." (when (yes-or-no-p (format "Buffer %s %s. Kill? " (buffer-name buffer) (if (buffer-modified-p buffer) @@ -4829,7 +4829,7 @@ specifies the list of buffers to kill, asking for approval for each one." (setq list (cdr list)))) (defun kill-matching-buffers (regexp &optional internal-too) - "Kill buffers whose name matches the specified regexp. + "Kill buffers whose name matches the specified REGEXP. The optional second argument indicates whether to kill internal buffers too." (interactive "sKill buffers matching this regular expression: \nP") (dolist (buffer (buffer-list)) @@ -5623,7 +5623,7 @@ be a predicate function such as `yes-or-no-p'." (defun save-buffers-kill-emacs (&optional arg) "Offer to save each buffer, then kill this Emacs process. -With prefix arg, silently save all file-visiting buffers, then kill." +With prefix ARG, silently save all file-visiting buffers, then kill." (interactive "P") (save-some-buffers arg t) (and (or (not (memq t (mapcar (function @@ -5653,7 +5653,7 @@ With prefix arg, silently save all file-visiting buffers, then kill." "Offer to save each buffer, then kill the current connection. If the current frame has no client, kill Emacs itself. -With prefix arg, silently save all file-visiting buffers, then kill. +With prefix ARG, silently save all file-visiting buffers, then kill. If emacsclient was started with a list of filenames to edit, then only these files will be asked to be saved." diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index c7ac9f4f7f..75ba2f026f 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -330,7 +330,7 @@ This sets the following coding systems: This also sets the following values: o default value used as `file-name-coding-system' for converting file names if CODING-SYSTEM is ASCII-compatible - o default value for the command `set-terminal-coding-system' (not on MSDOS) + o default value for the command `set-terminal-coding-system' (not on MS-DOS) o default value for the command `set-keyboard-coding-system' if CODING-SYSTEM is ASCII-compatible" (check-coding-system coding-system) @@ -370,7 +370,7 @@ This also sets the following coding systems: o default coding system for subprocess I/O This also sets the following values: o default value used as `file-name-coding-system' for converting file names - o default value for the command `set-terminal-coding-system' (not on MSDOS) + o default value for the command `set-terminal-coding-system' (not on MS-DOS) o default value for the command `set-keyboard-coding-system' If CODING-SYSTEM specifies a certain type of EOL conversion, the coding diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 84917dc8df..218cef7734 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2029,7 +2029,7 @@ FUNCTION-LIST is a list of entries of the form (FUNCTION FILE). The FUNCTION is intended to parse FILE according its syntax. It might be a predefined FUNCTION, or a user defined FUNCTION. Predefined FUNCTIONs are `tramp-parse-rhosts', `tramp-parse-shosts', -`tramp-parse-sconfig',`tramp-parse-hosts', `tramp-parse-passwd', +`tramp-parse-sconfig', `tramp-parse-hosts', `tramp-parse-passwd', and `tramp-parse-netrc'. Example: diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index e4de2380af..61c75ee60c 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -933,7 +933,7 @@ if the header needs to be version controlled. The following keywords for template generation are supported: : replaced by the name of the buffer : replaced by the user name and email address - \(`user-full-name',`mail-host-address', `user-mail-address') + \(`user-full-name', `mail-host-address', `user-mail-address') : replaced by user login name (`user-login-name') : replaced by contents of option `vhdl-company-name' : replaced by the current date diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 7b3516ec87..855642a3d2 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -259,7 +259,7 @@ are fixed-pitch." "The content of the echo area before help echo was displayed.") (defun msdos-show-help (help) - "Function installed as `show-help-function' on MSDOS frames." + "Function installed as `show-help-function' on MS-DOS frames." (when (and (not (window-minibuffer-p)) ;Don't overwrite minibuffer contents. ;; Don't know how to reproduce it in Elisp: ;; Don't overwrite a keystroke echo. diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 70057871c3..557681e86e 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -103,7 +103,7 @@ That includes all Windows systems except for 9X/Me." w32-system-shells))) (defun w32-shell-dos-semantics () - "Return non-nil if the interactive shell being used expects MSDOS shell semantics." + "Return non-nil if the interactive shell being used expects MS-DOS shell semantics." (or (w32-system-shell-p (w32-shell-name)) (and (member (downcase (file-name-nondirectory (w32-shell-name))) '("cmdproxy" "cmdproxy.exe")) diff --git a/src/ChangeLog b/src/ChangeLog index 466708fa2f..ef38bbf553 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-11-14 Juanma Barranquero + + * msdos.c (Fmsdos_long_file_names): + (syms_of_msdos) : + * dosfns.c (Fint86): Fix typos in docstrings. + 2008-11-14 Eli Zaretskii * makefile.w32-in (OBJ1, WIN32OBJ): Fix whitespace. diff --git a/src/dosfns.c b/src/dosfns.c index 240f19c338..419a4ef44e 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -48,7 +48,7 @@ along with GNU Emacs. If not, see . */ #endif DEFUN ("int86", Fint86, Sint86, 2, 2, 0, - doc: /* Call specific MSDOS interrupt number INTERRUPT with REGISTERS. + doc: /* Call specific MS-DOS interrupt number INTERRUPT with REGISTERS. Return the updated REGISTER vector. INTERRUPT should be an integer in the range 0 to 255. diff --git a/src/msdos.c b/src/msdos.c index c8a8b5f1b8..86b765fb68 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -4280,7 +4280,7 @@ int _rename(const char *old, const char *new) DEFUN ("msdos-long-file-names", Fmsdos_long_file_names, Smsdos_long_file_names, 0, 0, 0, - doc: /* Return non-nil if long file names are supported on MSDOS. */) + doc: /* Return non-nil if long file names are supported on MS-DOS. */) () { return (_USE_LFN ? Qt : Qnil); @@ -5247,7 +5247,7 @@ syms_of_msdos () DEFVAR_LISP ("dos-unsupported-char-glyph", &Vdos_unsupported_char_glyph, doc: /* *Glyph to display instead of chars not supported by current codepage. -This variable is used only by MSDOS terminals. */); +This variable is used only by MS-DOS terminals. */); Vdos_unsupported_char_glyph = make_number ('\177'); #endif -- 2.20.1