[Emacs-diffs] trunk r117910: * lisp/progmodes/prog-mode.el (prog-mode-hook): Replace reference to

[Stefan Monnier]

------------------------------------------------------------
revno: 117910
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18464
author: Tom Willemse <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2014-09-21 18:07:26 -0400
message:
  * lisp/progmodes/prog-mode.el (prog-mode-hook): Replace reference to
  Text mode in docstring.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/prog-mode.el    progmode.el-20091230193750-bspzfk1gt8nm2mal-14

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-21 22:00:28 +0000
+++ b/lisp/ChangeLog    2014-09-21 22:07:26 +0000
@@ -1,3 +1,8 @@
+2014-09-17  Tom Willemse  <address@hidden>  (tiny change)
+
+       * progmodes/prog-mode.el (prog-mode-hook): Replace reference to
+       Text mode in docstring (bug#18464).
+
 2014-09-21  Stefan Monnier  <address@hidden>
 
        * progmodes/perl-mode.el (perl-syntax-propertize-function):
@@ -41,8 +46,7 @@
 
        * image-mode.el (image-toggle-display-image): If we have a
        `fit-width' or a `fit-height', don't limit the size of the image
-       to the window size, because that doesn't preserve the aspect
-       ratio.
+       to the window size, because that doesn't preserve the aspect ratio.
        * image-mode.el: Move defvars earlier to avoid a byte-compilation
        warning.
 

=== modified file 'lisp/progmodes/prog-mode.el'
--- a/lisp/progmodes/prog-mode.el       2014-08-08 13:51:47 +0000
+++ b/lisp/progmodes/prog-mode.el       2014-09-21 22:07:26 +0000
@@ -36,7 +36,7 @@
   :group 'languages)
 
 (defcustom prog-mode-hook nil
-  "Normal hook run when entering Text mode and many related modes."
+  "Normal hook run when entering programming modes."
   :type 'hook
   :options '(flyspell-prog-mode abbrev-mode flymake-mode linum-mode
                                 prettify-symbols-mode)