From 9173deecd801321600a6c24186ce94147ae01753 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 5 Jul 2011 11:51:56 +0200 Subject: [PATCH] Fix typos. --- lisp/ChangeLog | 7 ++++++- lisp/custom.el | 2 +- lisp/dired-aux.el | 2 +- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/message.el | 2 +- lisp/mail/feedmail.el | 2 +- lisp/register.el | 2 +- lisp/window.el | 22 +++++++++++----------- src/ChangeLog | 14 +++++++------- src/eval.c | 2 +- src/gnutls.c | 2 +- 11 files changed, 35 insertions(+), 26 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c29524da1..653aa52f64 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,11 @@ +2011-07-05 Juanma Barranquero + + * register.el (registerv-make): + * window.el (window-min-height): Fix typos in docstrings. + 2011-07-05 Jan Djärv - * dynamic-setting.el (dynamic-setting-handle-config-changed-event): + * dynamic-setting.el (dynamic-setting-handle-config-changed-event): Update doc string. 2011-07-04 Juanma Barranquero diff --git a/lisp/custom.el b/lisp/custom.el index 11dc1859c0..a5c0065036 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -1407,7 +1407,7 @@ This function returns nil if no custom theme specifies a value for VARIABLE." (face-spec-recalc face frame))) -;;; XEmacs compability functions +;;; XEmacs compatibility functions ;; In XEmacs, when you reset a Custom Theme, you have to specify the ;; theme to reset it to. We just apply the next available theme, so diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index c7dd183ba4..9e3e3460fa 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1008,7 +1008,7 @@ See Info node `(emacs)Subdir switches' for more details." (dired-uncache (if (consp dired-directory) (car dired-directory) dired-directory)) (dired-map-over-marks (let ((fname (dired-get-filename)) - ;; Postphone readin hook till we map + ;; Postpone readin hook till we map ;; over all marked files (Bug#6810). (dired-after-readin-hook nil)) (message "Redisplaying... %s" fname) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 01efb9bcc2..628f9575a3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2011-07-05 Juanma Barranquero + + * message.el (message-return-action): Fix typo in docstring. + 2011-07-04 Lars Magne Ingebrigtsen * nnimap.el (nnimap-request-scan): Say that splitting has finished. diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 567eb33cf0..7d7cc01225 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1185,7 +1185,7 @@ It is a vector of the following headers: (defvar message-send-actions nil "A list of actions to be performed upon successful sending of a message.") (defvar message-return-action nil - "Action to return to the caller after sending or postphoning a message.") + "Action to return to the caller after sending or postponing a message.") (defvar message-exit-actions nil "A list of actions to be performed upon exiting after sending a message.") (defvar message-kill-actions nil diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index bc9a060427..f4b29958aa 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -351,7 +351,7 @@ ;; systems with non-classic /bin/[r]mail behavior ;; guard against nil user-mail-address in generating MESSAGE-ID: ;; feedmail-queue-slug-suspect-regexp is now a variable to -;; accomodate non-ASCII environments (thanks to +;; accommodate non-ASCII environments (thanks to ;; Makoto.Nakagawa@jp.compaq.com for this suggestion) ;; feedmail-buffer-to-smtp, to parallel feedmail-buffer-to-smtpmail ;; patchlevel 10, 22 April 2001 diff --git a/lisp/register.el b/lisp/register.el index 82a0cf33c3..221242546e 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -70,7 +70,7 @@ DATA can be any value. PRINT-FUNC if provided controls how `list-registers' and `view-register' print the register. It should be a function -recieving one argument DATA and print text that completes +receiving one argument DATA and print text that completes this sentence: Register X contains [TEXT PRINTED BY PRINT-FUNC] JUMP-FUNC if provided, controls how `jump-to-register' jumps to the register. diff --git a/lisp/window.el b/lisp/window.el index 64f4119027..f8b7abbb2b 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -163,8 +163,8 @@ Anything less might crash Emacs.") (defcustom window-min-height 4 "The minimum number of lines of any window. -The value has to accomodate a mode- or header-line if present. A -value less than `window-safe-min-height' is ignored. The value +The value has to accommodate a mode- or header-line if present. +A value less than `window-safe-min-height' is ignored. The value of this variable is honored when windows are resized or split. Applications should never rebind this variable. To resize a @@ -3380,7 +3380,7 @@ WINDOW must be an iso-combination." (balance-windows-2 window horizontal) (let ((size (window-new-total window))) (while sub - (set-window-new-total sub size) + (set-window-new-total sub size) (balance-windows-1 sub horizontal) (setq sub (window-right sub)))))))) @@ -5039,7 +5039,7 @@ description." (setq window (cond ((eq cand 'largest) - ;; The largest window. + ;; The largest window. (get-largest-window frame t)) ((eq cand 'lru) ;; The least recently used window. @@ -5750,7 +5750,7 @@ this list as arguments." (display-buffer-reuse-window buffer '(nil nil t) '((reuse-window-dedicated . t))))))) -(defsubst display-buffer-same-window (&optional buffer-or-name label) +(defsubst display-buffer-same-window (&optional buffer-or-name label) "Display buffer specified by BUFFER-OR-NAME in the selected window. Another window will be used only if the buffer can't be shown in the selected window, usually because it is dedicated to another @@ -5759,7 +5759,7 @@ buffer. Optional argument BUFFER-OR-NAME and LABEL are as for (interactive "BDisplay buffer in same window:\nP") (display-buffer buffer-or-name 'same-window label)) -(defsubst display-buffer-same-frame (&optional buffer-or-name label) +(defsubst display-buffer-same-frame (&optional buffer-or-name label) "Display buffer specified by BUFFER-OR-NAME in a window on the same frame. Another frame will be used only if there is no other choice. Optional argument BUFFER-OR-NAME and LABEL are as for @@ -5767,7 +5767,7 @@ Optional argument BUFFER-OR-NAME and LABEL are as for (interactive "BDisplay buffer on same frame:\nP") (display-buffer buffer-or-name 'same-frame label)) -(defsubst display-buffer-other-window (&optional buffer-or-name label) +(defsubst display-buffer-other-window (&optional buffer-or-name label) "Display buffer specified by BUFFER-OR-NAME in another window. The selected window will be used only if there is no other choice. Windows on the selected frame are preferred to windows @@ -5776,7 +5776,7 @@ for `display-buffer'." (interactive "BDisplay buffer in another window:\nP") (display-buffer buffer-or-name 'other-window label)) -(defun display-buffer-same-frame-other-window (&optional buffer-or-name label) +(defun display-buffer-same-frame-other-window (&optional buffer-or-name label) "Display buffer specified by BUFFER-OR-NAME in another window on the same frame. The selected window or another frame will be used only if there is no other choice. Optional argument BUFFER-OR-NAME and LABEL are @@ -5853,7 +5853,7 @@ as for `pop-to-buffer'." (interactive "BPop to buffer in selected window:\nP") (pop-to-buffer buffer-or-name 'same-window norecord label)) -(defsubst pop-to-buffer-same-frame (&optional buffer-or-name norecord label) +(defsubst pop-to-buffer-same-frame (&optional buffer-or-name norecord label) "Pop to buffer specified by BUFFER-OR-NAME in a window on the selected frame. Another frame will be used only if there is no other choice. Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are as for @@ -5870,7 +5870,7 @@ LABEL are as for `pop-to-buffer'." (interactive "BPop to buffer in another window:\nP") (pop-to-buffer buffer-or-name 'other-window norecord)) -(defsubst pop-to-buffer-same-frame-other-window (&optional buffer-or-name norecord label) +(defsubst pop-to-buffer-same-frame-other-window (&optional buffer-or-name norecord label) "Pop to buffer specified by BUFFER-OR-NAME in another window on the selected frame. The selected window or another frame will be used only if there is no other choice. Optional arguments BUFFER-OR-NAME, NORECORD @@ -6908,7 +6908,7 @@ WINDOW was scrolled." ;; window and the current buffer when we're done. (setq window (window-normalize-live-window window)) ;; Can't resize a full height or fixed-size window. - (unless (or (window-size-fixed-p window) + (unless (or (window-size-fixed-p window) (window-full-height-p window)) ;; `with-selected-window' should orderly restore the current buffer. (with-selected-window window diff --git a/src/ChangeLog b/src/ChangeLog index 1cc0b5a4dc..dc62da2035 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -173,7 +173,7 @@ with value as argument. (init_gsettings): Check that GSETTINGS_SCHEMA exists before calling g_settings_new (Bug#8967). Do not create gsettings_obj. - Remove calls to g_settings_bind. Connect something_changedCB to + Remove calls to g_settings_bind. Connect something_changedCB to "changed". * xgselect.c: Add defined (HAVE_GSETTINGS). @@ -270,8 +270,8 @@ min_width/height (Bug#8919). * gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new. - (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix - indentation. + (x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. + Fix indentation. 2011-06-26 Eli Zaretskii @@ -1832,7 +1832,7 @@ and %.0c. Fix bug with strchr succeeding on '\0' when looking for flags. Fix bug with (format "%c" 256.0). Avoid integer overflow when formatting out-of-range floating point numbers with int - formats. (Bug#8668) + formats. (Bug#8668) * lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN. @@ -2796,9 +2796,9 @@ :verify-hostname-error, :verify-error, and :verify-flags parameters of `gnutls-boot' and documented those parameters in the docstring. Start callback support. - (emacs_gnutls_handshake): Add Woe32 support. Retry handshake - unless a fatal error occured. Call gnutls_alert_send_appropriate - on error. Return error code. + (emacs_gnutls_handshake): Add Woe32 support. Retry handshake + unless a fatal error occurred. Call gnutls_alert_send_appropriate + on error. Return error code. (emacs_gnutls_write): Call emacs_gnutls_handle_error. (emacs_gnutls_read): Likewise. (Fgnutls_boot): Return handshake error code. diff --git a/src/eval.c b/src/eval.c index e8a3f947f9..90d0df6185 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3162,7 +3162,7 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs, shouldn't bind any arguments, instead just call the byte-code interpreter directly; it will push arguments as necessary. - Byte-code objects with either a non-existant, or a nil value for + Byte-code objects with either a non-existent, or a nil value for the `push args' slot (the default), have dynamically-bound arguments, and use the argument-binding code below instead (as do all interpreted functions, even lexically bound ones). */ diff --git a/src/gnutls.c b/src/gnutls.c index 55c7ff01c0..76cfa5dcc9 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -379,7 +379,7 @@ emacs_gnutls_read (struct Lisp_Process *proc, char *buf, EMACS_INT nbyte) /* non-fatal error */ return -1; else { - /* a fatal error occured */ + /* a fatal error occurred */ return 0; } } -- 2.20.1