emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r104959: Fix typos.


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104959: Fix typos.
Date: Tue, 05 Jul 2011 11:51:56 +0200
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104959
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-05 11:51:56 +0200
message:
  Fix typos.
modified:
  lisp/ChangeLog
  lisp/custom.el
  lisp/dired-aux.el
  lisp/gnus/ChangeLog
  lisp/gnus/message.el
  lisp/mail/feedmail.el
  lisp/register.el
  lisp/window.el
  src/ChangeLog
  src/eval.c
  src/gnutls.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-05 08:21:38 +0000
+++ b/lisp/ChangeLog    2011-07-05 09:51:56 +0000
@@ -1,6 +1,11 @@
+2011-07-05  Juanma Barranquero  <address@hidden>
+
+       * register.el (registerv-make):
+       * window.el (window-min-height): Fix typos in docstrings.
+
 2011-07-05  Jan Djärv  <address@hidden>
 
-       * 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  <address@hidden>

=== modified file 'lisp/custom.el'
--- a/lisp/custom.el    2011-07-03 22:16:07 +0000
+++ b/lisp/custom.el    2011-07-05 09:51:56 +0000
@@ -1407,7 +1407,7 @@
     (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

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2011-07-01 13:37:00 +0000
+++ b/lisp/dired-aux.el 2011-07-05 09:51:56 +0000
@@ -1008,7 +1008,7 @@
     (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)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-07-04 13:11:52 +0000
+++ b/lisp/gnus/ChangeLog       2011-07-05 09:51:56 +0000
@@ -1,3 +1,7 @@
+2011-07-05  Juanma Barranquero  <address@hidden>
+
+       * message.el (message-return-action): Fix typo in docstring.
+
 2011-07-04  Lars Magne Ingebrigtsen  <address@hidden>
 
        * nnimap.el (nnimap-request-scan): Say that splitting has finished.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-07-03 00:24:28 +0000
+++ b/lisp/gnus/message.el      2011-07-05 09:51:56 +0000
@@ -1185,7 +1185,7 @@
 (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

=== modified file 'lisp/mail/feedmail.el'
--- a/lisp/mail/feedmail.el     2011-07-03 20:09:38 +0000
+++ b/lisp/mail/feedmail.el     2011-07-05 09:51:56 +0000
@@ -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
 ;;           address@hidden for this suggestion)
 ;;         feedmail-buffer-to-smtp, to parallel feedmail-buffer-to-smtpmail
 ;; patchlevel 10, 22 April 2001

=== modified file 'lisp/register.el'
--- a/lisp/register.el  2011-06-26 06:37:04 +0000
+++ b/lisp/register.el  2011-07-05 09:51:56 +0000
@@ -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.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-07-02 10:36:48 +0000
+++ b/lisp/window.el    2011-07-05 09:51:56 +0000
@@ -163,8 +163,8 @@
 
 (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 @@
            (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 @@
          (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 @@
          (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 @@
   (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 @@
   (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 @@
   (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 @@
   (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 @@
   (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 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-05 08:21:38 +0000
+++ b/src/ChangeLog     2011-07-05 09:51:56 +0000
@@ -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  <address@hidden>
 
@@ -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.

=== modified file 'src/eval.c'
--- a/src/eval.c        2011-07-04 02:14:42 +0000
+++ b/src/eval.c        2011-07-05 09:51:56 +0000
@@ -3162,7 +3162,7 @@
           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).  */

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2011-07-04 02:47:04 +0000
+++ b/src/gnutls.c      2011-07-05 09:51:56 +0000
@@ -379,7 +379,7 @@
     /* non-fatal error */
     return -1;
   else {
-    /* a fatal error occured */
+    /* a fatal error occurred */
     return 0;
   }
 }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]