[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108641: Spelling fixes.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108641: Spelling fixes. |
Date: |
Sun, 17 Jun 2012 01:53:31 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108641
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-17 01:53:31 -0700
message:
Spelling fixes.
modified:
etc/NEWS
etc/ORG-NEWS
lisp/ChangeLog
lisp/face-remap.el
lisp/isearch.el
lisp/net/tramp.el
lisp/org/ChangeLog
lisp/progmodes/python.el
lisp/textmodes/rst.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2012-06-17 05:13:40 +0000
+++ b/etc/NEWS 2012-06-17 08:53:31 +0000
@@ -441,7 +441,7 @@
** New error type and new function `user-error'. Doesn't trigger the debugger.
** The functions get-lru-window, get-mru-window and get-largest-window
-now accept a third argument to avoid chosing the selected window.
+now accept a third argument to avoid choosing the selected window.
** Completion
=== modified file 'etc/ORG-NEWS'
--- a/etc/ORG-NEWS 2012-05-29 06:16:49 +0000
+++ b/etc/ORG-NEWS 2012-06-17 08:53:31 +0000
@@ -554,7 +554,7 @@
** Completion
-*** In-buffer completion is now done using John Wiegleys pcomplete.el
+*** In-buffer completion is now done using John Wiegley's pcomplete.el
:PROPERTIES:
:OrgVersion: 7.4
:END:
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-17 08:26:13 +0000
+++ b/lisp/ChangeLog 2012-06-17 08:53:31 +0000
@@ -1,3 +1,8 @@
+2012-06-17 Paul Eggert <address@hidden>
+
+ * progmodes/python.el (python-info-beginning-of-backslash):
+ Rename from python-info-beginning-of-backlash, as a spelling fix.
+
2012-06-17 Chong Yidong <address@hidden>
* term.el (term-emulate-terminal): If term-check-size is called,
=== modified file 'lisp/face-remap.el'
--- a/lisp/face-remap.el 2012-06-09 06:26:46 +0000
+++ b/lisp/face-remap.el 2012-06-17 08:53:31 +0000
@@ -320,7 +320,7 @@
(`?0 0)
(t inc))))
(text-scale-increase step)
- ;; FIXME: do it after everu "iteration of the loop".
+ ;; FIXME: do it after every "iteration of the loop".
(message "+,-,0 for further adjustment: ")
(set-temporary-overlay-map
(let ((map (make-sparse-keymap)))
=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el 2012-05-29 09:46:06 +0000
+++ b/lisp/isearch.el 2012-06-17 08:53:31 +0000
@@ -538,7 +538,7 @@
If the value is a function (e.g. `isearch-symbol-regexp'), it is called to
convert the search string to a regexp used by regexp search functions.
The property `isearch-message-prefix' put on this function specifies the
-prefix string displyed in the search message.")
+prefix string displayed in the search message.")
(defvar isearch-cmds nil
"Stack of search status sets.
=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2012-06-11 10:30:07 +0000
+++ b/lisp/net/tramp.el 2012-06-17 08:53:31 +0000
@@ -1368,7 +1368,7 @@
(defvar tramp-message-show-progress-reporter-message t
"Show Tramp progress reporter message in the minibuffer.
-This variable is used to disable recurive progress reporter messages.")
+This variable is used to disable recursive progress reporter messages.")
(defsubst tramp-message (vec-or-proc level fmt-string &rest args)
"Emit a message depending on verbosity level.
=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog 2012-06-10 13:20:58 +0000
+++ b/lisp/org/ChangeLog 2012-06-17 08:53:31 +0000
@@ -11665,7 +11665,7 @@
2010-11-11 Nicolas Goaziou <address@hidden>
* org-list.el (org-list-insert-item-generic): Updating checkboxes
- can modifiy bottom point of a list, so make it a marker before
+ can modify bottom point of a list, so make it a marker before
calling `org-update-checkbox-count-maybe'.
2010-11-11 Dan Davison <address@hidden>
=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el 2012-06-15 02:22:19 +0000
+++ b/lisp/progmodes/python.el 2012-06-17 08:53:31 +0000
@@ -50,7 +50,7 @@
;; (`python-nav-forward-sentence', `python-nav-backward-sentence'
;; respectively). Extra functions `python-nav-sentence-start' and
;; `python-nav-sentence-end' are included to move to the beginning and
-;; to the end of a setence while taking care of multiline definitions.
+;; to the end of a sentence while taking care of multiline definitions.
;; `python-nav-jump-to-defun' is provided and allows jumping to a
;; function or class definition quickly in the current buffer.
@@ -126,7 +126,7 @@
;; "VIRTUAL_ENV=/path/to/env/"))
;; (python-shell-exec-path . ("/path/to/env/bin/"))
-;; Since the above is cumbersome and can be programatically
+;; Since the above is cumbersome and can be programmatically
;; calculated, the variable `python-shell-virtualenv-path' is
;; provided. When this variable is set with the path of the
;; virtualenv to use, `process-environment' and `exec-path' get proper
@@ -426,7 +426,7 @@
;; Extra:
"__all__" "__doc__" "__name__" "__package__")
symbol-end) . font-lock-builtin-face)
- ;; asignations
+ ;; assignments
;; support for a = b = c = 5
(,(lambda (limit)
(let ((re (python-rx (group (+ (any word ?. ?_)))
@@ -703,7 +703,7 @@
('inside-string
(goto-char context-start)
(current-indentation))
- ;; After backslash we have several posibilities
+ ;; After backslash we have several possibilities.
('after-backslash
(cond
;; Check if current line is a dot continuation. For this
@@ -758,12 +758,12 @@
(current-column))))
(t
(forward-line -1)
- (goto-char (python-info-beginning-of-backlash))
+ (goto-char (python-info-beginning-of-backslash))
(if (save-excursion
(and
(forward-line -1)
(goto-char
- (or (python-info-beginning-of-backlash) (point)))
+ (or (python-info-beginning-of-backslash) (point)))
(python-info-line-ends-backslash-p)))
;; The two previous lines ended in a backslash so we must
;; respect previous line indentation.
@@ -776,7 +776,7 @@
;; correctly
('inside-paren
(cond
- ;; If current line closes the outtermost open paren use the
+ ;; If current line closes the outermost open paren use the
;; current indentation of the context-start line.
((save-excursion
(skip-syntax-forward "\s" (line-end-position))
@@ -1261,7 +1261,7 @@
(defcustom python-shell-send-setup-max-wait 5
"Seconds to wait for process output before code setup.
-If output is received before the especified time then control is
+If output is received before the specified time then control is
returned in that moment and not after waiting."
:type 'integer
:group 'python
@@ -1811,7 +1811,7 @@
(overlay-start comint-last-prompt-overlay)
(overlay-end comint-last-prompt-overlay))))
(completion-context
- ;; Check wether a prompt matches a pdb string, an import statement
+ ;; Check whether a prompt matches a pdb string, an import statement
;; or just the standard prompt and use the correct
;; python-shell-completion-*-code string
(cond ((and (> (length python-shell-completion-pdb-string-code) 0)
@@ -2474,7 +2474,7 @@
(defun python-imenu-make-element-tree (element-list full-element plain-index)
"Make a tree from plain alist of module names.
-ELEMENT-LIST is the defun name splitted by \".\" and FULL-ELEMENT
+ELEMENT-LIST is the defun name split by \".\" and FULL-ELEMENT
is the same thing, the difference is that FULL-ELEMENT remains
untouched in all recursive calls.
Argument PLAIN-INDEX is the calculated plain index used to build the tree."
@@ -2497,7 +2497,7 @@
(push (cons subelement-name subelement-point)
python-imenu-index-alist)
(when (not (listp (cdr path-ref)))
- ;; Modifiy root cdr to be a list
+ ;; Modify root cdr to be a list.
(setcdr path-ref
(list (cons (format python-imenu-subtree-root-label
(car path-ref))
@@ -2644,8 +2644,8 @@
(when (equal (char-before) ?\\)
(point-marker)))))
-(defun python-info-beginning-of-backlash (&optional line-number)
- "Return the point where the backlashed line start.
+(defun python-info-beginning-of-backslash (&optional line-number)
+ "Return the point where the backslashed line start.
Optional argument LINE-NUMBER forces the line number to check against."
(save-excursion
(save-restriction
=== modified file 'lisp/textmodes/rst.el'
--- a/lisp/textmodes/rst.el 2012-06-16 09:48:23 +0000
+++ b/lisp/textmodes/rst.el 2012-06-17 08:53:31 +0000
@@ -2847,7 +2847,7 @@
(save-match-data
(unless (looking-at (rst-re 'lin-end))
(back-to-indentation)
- ;; Current indendation is always the least likely tab.
+ ;; Current indentation is always the least likely tab.
(let ((tabs (list (list (point) 0 nil)))) ; (POINT OFFSET INNER)
;; Push inner tabs more likely to continue writing.
(cond
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108641: Spelling fixes.,
Paul Eggert <=