mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-05 20:43:08 +00:00
Code Issues Releases Activity

Spelling fixes.

Browse Source
This commit is contained in:
Paul Eggert 2012-06-17 01:53:31 -07:00
parent eb4a8a9a88
commit 48d1354eb8
9 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/NEWS
View File

@ -441,7 +441,7 @@ The interpretation of the DECLS is determined by `defun-declarations-alist'.
** 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

2
etc/ORG-NEWS
View File

@ -554,7 +554,7 @@ to mean anything.
** 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:

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-17 Paul Eggert <eggert@cs.ucla.edu>
* progmodes/python.el (python-info-beginning-of-backslash):
Rename from python-info-beginning-of-backlash, as a spelling fix.
2012-06-17 Chong Yidong <cyd@gnu.org>
* term.el (term-emulate-terminal): If term-check-size is called,

2
lisp/face-remap.el
View File

@ -320,7 +320,7 @@ a top-level keymap, `text-scale-increase' or
(`?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)))

2
lisp/isearch.el
View File

@ -538,7 +538,7 @@ If t, do incremental search for a sequence of words, ignoring punctuation.
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.

2
lisp/net/tramp.el
View File

@ -1368,7 +1368,7 @@ The messages are visible anyway, because an error is raised.")
(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.

2
lisp/org/ChangeLog
View File

@ -11665,7 +11665,7 @@
2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
* 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 <davison@stats.ox.ac.uk>

26
lisp/progmodes/python.el
View File

@ -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 @@ This variant of `rx' supports common python named REGEXPS."
;; 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 @@ START is the buffer position where the sexp starts."
('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 @@ START is the buffer position where the sexp starts."
(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 @@ START is the buffer position where the sexp starts."
;; 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 @@ Restart the python shell after changing this variable for it to take effect."
(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 @@ completions on the current context."
(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 @@ It can contain a \"%s\" which will be replaced with the root name."
(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 @@ Argument PLAIN-INDEX is the calculated plain index used to build the tree."
(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 @@ With optional argument LINE-NUMBER, check that line instead."
(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

2
lisp/textmodes/rst.el
View File

@ -2847,7 +2847,7 @@ and not from inner alignment points."
(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