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".

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5dcdc563e566821d9a55070014fe9165c1b0a1f6..9470c93326499b79b84152d99e68ff26459fb4cb 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Spelling fixes; tweak explanation of commit messages.
+       * 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.
+
 2014-11-01  Eli Zaretskii  <eliz@gnu.org>
 
        * notes/repo (Notes): Reword the stylistic guidance for commit log

diff --git a/admin/notes/repo b/admin/notes/repo
index 276dd372b378fbeab51e22034a5c21254970d60e..601c41062fda05f689b0d63de47f34916a61bb77 100644 (file)
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -1,19 +1,22 @@
 NOTES ON COMMITTING TO EMACS'S REPOSITORY    -*- outline -*-
 
-* Use DVCS commenting conventions
+* Use conventions in commit messages
 
-Commits should follow the conventions used in all modern distributed
-version-control systems. That is, they should consist of
+Commit messages should follow conventions used in modern distributed
+version control systems.
 
-- A self-contained topic line, preferably no more than 75 chars long.
+- Start with a self-contained topic line, preferably no longer than 75 chars.
 
-- If other content follows the topic line, there should be a blank
-  line separating the two.
+- Make the second line blank, if there are two or more lines.
 
 - Follow the blank line with ChangeLog-like entries for the specific
-  changes you made, if any.  (As long as Emacs maintains ChangeLog
+  changes you made, if any.  As long as Emacs maintains ChangeLog
   files, just copy the entries you made in them to the commit message
-  after the blank line.)
+  after the blank line.  Often, the first line of a ChangeLog entry
+  can serve as the topic line, so you can merely insert a blank line
+  after it.
+
+- Use UTF-8 encoding in the commit message.
 
 * Commit to the right branch
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e849a1c0b1f9b5ef36ce8b524a9b5ba4cb74badd..4684c017d949fb0ab394dbcc18b44633b1d1c585 100644 (file)
--- 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 4f7a804b386affe02701ca1876859e4db1c1b3a9..800db63aff6d1ffe7a840bc7edd32448c3ae9e49 100644 (file)
--- 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 0e8539b795b9a9a62bebd2ca5491055edc866b88..e596f0713b4d6eadd0a4ade716b1063a91970dfa 100644 (file)
--- 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 fcbd06da0d0b194124455e6fd23693402e2332cf..a1d1c3120fb1604f2b5cba11993cd641ecd393f4 100644 (file)
--- 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)