summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-11-04 09:46:49 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2014-11-04 09:46:49 -0800
commita9f1618de84c72516aae1c4d054d44d2b36750d2 (patch)
treeefa237f59581b0a6fb45e8da711a606f5e6b85f7 /lisp
parentf3e25d69b0fc9e3a594e2087b30f610514db39b1 (diff)
downloademacs-a9f1618de84c72516aae1c4d054d44d2b36750d2.tar.gz
Spelling fixes; tweak explanation of commit messages.
* admin/notes/repo: Avoid "DVCS" acronym without first explaining it. Mention using the first line of a ChangeLog as the topic line, and that commit messages should use UTF-8. * lisp/mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mouse.el2
-rw-r--r--lisp/progmodes/cc-engine.el2
-rw-r--r--lisp/startup.el2
4 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e849a1c0b1f..4684c017d94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-04 Paul Eggert <eggert@cs.ucla.edu>
+
+ * mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
+
2014-11-04 Teodor Zlatanov <tzz@lifelogs.com>
* net/eww.el (eww): Trim URL with `string-trim'.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 4f7a804b386..800db63aff6 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -450,7 +450,7 @@ must be one of the symbols `header', `mode', or `vertical'."
(setq position (+ (window-pixel-top posn-window) position))
;; If necessary, add height of header line to `position'
(when (memq (posn-area start)
- '(nil left-fringe right-frings left-margin right-margin))
+ '(nil left-fringe right-fringe left-margin right-margin))
(setq position (+ (window-header-line-height posn-window) position))))
;; When the cursor overshoots after shrinking a window to its
;; minimum size and the dragging direction changes, have the
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0e8539b795b..e596f0713b4 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8602,7 +8602,7 @@ comment at the start of cc-engine.el for more info."
(defun c-backward-colon-prefixed-type ()
;; We're at the token after what might be a type prefixed with a colon. Try
;; moving backward over this type and the colon. On success, return t and
- ;; leave point before colon, on falure, leave point unchanged. Will clobber
+ ;; leave point before colon; on failure, leave point unchanged. Will clobber
;; match data.
(let ((here (point))
(colon-pos nil))
diff --git a/lisp/startup.el b/lisp/startup.el
index fcbd06da0d0..a1d1c3120fb 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1491,7 +1491,7 @@ Each element in the list should be a list of strings or pairs
(title (with-temp-buffer
(insert-file-contents
(expand-file-name tut tutorial-directory)
- ;; Reat the entire file, to make sure any
+ ;; Read the entire file, to make sure any
;; coding cookies and other local variables
;; get acted upon.
nil)