[Emacs-diffs] trunk r118286: Spelling fixes; tweak explanation of commit messages.

[Paul Eggert]

------------------------------------------------------------
revno: 118286
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-11-04 09:46:49 -0800
message:
  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".
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/notes/repo               bzr-20100518025134-ebvhi2w74h1r56u7-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mouse.el                  mouse.el-20091113204419-o5vbwnq5f7feedwu-123
  lisp/progmodes/cc-engine.el    
ccengine.el-20091113204419-o5vbwnq5f7feedwu-1227
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-11-01 18:05:30 +0000
+++ b/admin/ChangeLog   2014-11-04 17:46:49 +0000
@@ -1,3 +1,10 @@
+2014-11-04  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * notes/repo (Notes): Reword the stylistic guidance for commit log

=== modified file 'admin/notes/repo'
--- a/admin/notes/repo  2014-11-01 18:05:30 +0000
+++ b/admin/notes/repo  2014-11-04 17:46:49 +0000
@@ -1,19 +1,22 @@
 NOTES ON COMMITTING TO EMACS'S REPOSITORY    -*- outline -*-
 
-* Use DVCS commenting conventions
-
-Commits should follow the conventions used in all modern distributed
-version-control systems. That is, they should consist of
-
-- A self-contained topic line, preferably no more than 75 chars long.
-
-- If other content follows the topic line, there should be a blank
-  line separating the two.
+* Use conventions in commit messages
+
+Commit messages should follow conventions used in modern distributed
+version control systems.
+
+- Start with a self-contained topic line, preferably no longer than 75 chars.
+
+- 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
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-04 16:31:33 +0000
+++ b/lisp/ChangeLog    2014-11-04 17:46:49 +0000
@@ -1,3 +1,7 @@
+2014-11-04  Paul Eggert  <address@hidden>
+
+       * mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
+
 2014-11-04  Teodor Zlatanov  <address@hidden>
 
        * net/eww.el (eww): Trim URL with `string-trim'.

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2014-10-24 09:58:43 +0000
+++ b/lisp/mouse.el     2014-11-04 17:46:49 +0000
@@ -450,7 +450,7 @@
                  (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

=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el       2014-10-30 16:07:19 +0000
+++ b/lisp/progmodes/cc-engine.el       2014-11-04 17:46:49 +0000
@@ -8602,7 +8602,7 @@
 (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))

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2014-10-30 22:52:38 +0000
+++ b/lisp/startup.el   2014-11-04 17:46:49 +0000
@@ -1491,7 +1491,7 @@
              (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)