[Emacs-diffs] trunk r116593: Document `prettify-symbols-mode' and `global-prettify-symbols-mode'.

[Xue Fuqiao]

------------------------------------------------------------
revno: 116593 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-28 11:04:12 +0800
message:
  Document `prettify-symbols-mode' and `global-prettify-symbols-mode'.
  
  * doc/emacs/emacs.texi (Top):
  * doc/emacs/programs.texi (Programs, Prettifying Symbols):
  Document `prettify-symbols-mode' and `global-prettify-symbols-mode'.
  
  * etc/NEWS: Markup changes.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/emacs.texi           emacs.texi-20091113204419-o5vbwnq5f7feedwu-6246
  doc/emacs/programs.texi        
programs.texi-20091113204419-o5vbwnq5f7feedwu-6272
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-02-28 01:05:49 +0000
+++ b/doc/emacs/ChangeLog       2014-02-28 03:02:50 +0000
@@ -1,5 +1,9 @@
 2014-02-28  Xue Fuqiao  <address@hidden>
 
+       * emacs.texi (Top):
+       * programs.texi (Programs, Prettifying Symbols):
+       Document `prettify-symbols-mode' and `global-prettify-symbols-mode'.
+
        * misc.texi (Saving Emacs Sessions): Document some new desktop user 
options.
 
 2014-02-27  Xue Fuqiao  <address@hidden>

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2014-02-09 02:08:17 +0000
+++ b/doc/emacs/emacs.texi      2014-02-28 03:02:50 +0000
@@ -670,6 +670,7 @@
 * Symbol Completion::   Completion on symbol names of your program or language.
 * MixedCase Words::     Dealing with identifiersLikeThis.
 * Semantic::            Suite of editing tools based on source code parsing.
+* Prettifying Symbols:: Display symbols as composed characters.
 * Misc for Programs::   Other Emacs features useful for editing programs.
 * C Modes::             Special commands of C, C++, Objective-C,
                           Java, IDL, Pike and AWK modes.

=== modified file 'doc/emacs/programs.texi'
--- a/doc/emacs/programs.texi   2014-02-27 11:59:35 +0000
+++ b/doc/emacs/programs.texi   2014-02-28 03:02:50 +0000
@@ -38,6 +38,7 @@
 * Symbol Completion::   Completion on symbol names of your program or language.
 * MixedCase Words::     Dealing with identifiersLikeThis.
 * Semantic::            Suite of editing tools based on source code parsing.
+* Prettifying Symbols:: Display symbols as composed characters.
 * Misc for Programs::   Other Emacs features useful for editing programs.
 * C Modes::             Special commands of C, C++, Objective-C, Java,
                           IDL, Pike and AWK modes.
@@ -1432,6 +1433,37 @@
 @xref{Top, Semantic,, semantic, Semantic}, for details.
 @end ifnottex
 
address@hidden Prettifying Symbols
address@hidden Prettifying Symbols
address@hidden prettifying symbols
address@hidden symbol, prettifying
+
address@hidden and @code{global-prettify-symbols-mode}
+are two minor modes (@pxref{Minor Modes}) that can display specified
+symbols as composed characters.  For instance, in Emacs Lisp mode
+(@pxref{Lisp Eval}), this mode will replace the string ``lambda'' with
+the Greek lambda character.
+
address@hidden prettify-symbols-mode
address@hidden prettify-symbols-alist
+When Prettify Symbols mode and Font Lock mode (@pxref{Font Lock}) are
+enabled, symbols are prettified (displayed as composed characters)
+according to the rules in @code{prettify-symbols-alist}, which are
+locally defined by major modes (@pxref{Major Modes}) supporting
+prettifying.  To add further customizations for a given major mode,
+you can modify @code{prettify-symbols-alist}.  For example:
+
address@hidden
+(add-hook 'emacs-lisp-mode-hook
+         (lambda ()
+           (push '("<=" . ?≤) prettify-symbols-alist)))
address@hidden example
+
address@hidden global-prettify-symbols-mode
+You can enable this mode locally in desired buffers, or use
address@hidden to enable it for all modes that
+support it.
+
 @node Misc for Programs
 @section Other Features Useful for Editing Programs
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-02-28 01:49:25 +0000
+++ b/etc/NEWS  2014-02-28 03:02:50 +0000
@@ -1185,6 +1185,7 @@
 The default `crm-separator' has been changed to allow surrounding spaces
 around the comma.
 
+---
 *** The `common-substring' argument of `display-completion-list',
 which has been documented as obsolete since Emacs 23.1, is now _really_
 obsolete, and no longer advertised.  Instead use either
@@ -1200,6 +1201,7 @@
 *** New function `completion-table-merge' to combine several
 completion tables by merging their completions.
 
++++
 ** New minor modes `prettify-symbols-mode' and `global-prettify-symbols-mode'
 display specified symbols as composed characters.  E.g., in Emacs Lisp mode,
 this replaces the string "lambda" with the Greek lambda character.