aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBozhidar Batsov2013-11-22 14:28:23 +0200
committerBozhidar Batsov2013-11-22 14:28:23 +0200
commitd19ffd647dbf4a1c0e7a10752f03259349ed15eb (patch)
tree38cf7e9c1d18f3f99b031fa02ff5ea1f56cc568d
parent30654657035a94e93d405b7105e19910252dda25 (diff)
downloademacs-d19ffd647dbf4a1c0e7a10752f03259349ed15eb.tar.gz
emacs-d19ffd647dbf4a1c0e7a10752f03259349ed15eb.zip
* lisp/progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):
Improve docstring.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddb0a4e2b5e..a2348ccf8f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-11-22 Bozhidar Batsov <bozhidar@batsov.com>
2
3 * progmodes/ruby-mode.el (ruby-custom-encoding-magic-comment-template):
4 Improve docstring.
5
12013-11-22 Leo Liu <sdl.web@gmail.com> 62013-11-22 Leo Liu <sdl.web@gmail.com>
2 7
3 * progmodes/octave.el (octave-operator-regexp): Exclude newline. 8 * progmodes/octave.el (octave-operator-regexp): Exclude newline.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 0e507b82115..f3cf84d4056 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -273,8 +273,8 @@ even if it's not required."
273 :group 'ruby) 273 :group 'ruby)
274 274
275(defcustom ruby-custom-encoding-magic-comment-template "# encoding: %s" 275(defcustom ruby-custom-encoding-magic-comment-template "# encoding: %s"
276 "The encoding comment template to be used when 276 "A custom encoding comment template.
277`ruby-encoding-magic-comment-style' is set to `custom'." 277It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
278 :type 'string 278 :type 'string
279 :group 'ruby) 279 :group 'ruby)
280 280