aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-06-18 21:07:27 -0400
committerGlenn Morris2015-06-18 21:07:27 -0400
commitaad7ea32c57c7b9673a8d429524e050dac2d210c (patch)
treee9a59bd82616014bbee866b8691231d84b063695
parentd213cf0400ee5cad2e7f4626745fd97b942ff5e9 (diff)
downloademacs-aad7ea32c57c7b9673a8d429524e050dac2d210c.tar.gz
emacs-aad7ea32c57c7b9673a8d429524e050dac2d210c.zip
* lisp/cus-start.el (help-quote-translation): Add :version.
; * etc/NEWS: Add placeholder.
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/cus-start.el12
2 files changed, 8 insertions, 6 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 06f7c8f8eee..1611c7a7926 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -959,6 +959,8 @@ apostrophe `like-this'. The new style looks better on today's displays.
959When an old-style string is copied to a help buffer it is converted to 959When an old-style string is copied to a help buffer it is converted to
960the new style. 960the new style.
961 961
962** New option `help-quote-translation'.
963
962+++ 964+++
963** Time-related changes: 965** Time-related changes:
964 966
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 5dd36811436..12def4c4148 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -221,12 +221,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
221 (no-redraw-on-reenter display boolean) 221 (no-redraw-on-reenter display boolean)
222 222
223 ;; doc.c 223 ;; doc.c
224 (help-quote-translation help 224 (help-quote-translation help
225 (choice 225 (choice
226 (const :tag "No translation" nil) 226 (const :tag "No translation" nil)
227 (const :tag "Translate curly single quotes to ASCII" traditional) 227 (const :tag "Translate curly single quotes to ASCII" traditional)
228 (const :tag "Translate ASCII single quotes to curly" prefer-unicode))) 228 (const :tag "Translate ASCII single quotes to curly" prefer-unicode))
229 229 "25.1")
230 ;; dosfns.c 230 ;; dosfns.c
231 (dos-display-scancodes display boolean) 231 (dos-display-scancodes display boolean)
232 (dos-hyper-key keyboard integer) 232 (dos-hyper-key keyboard integer)