aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode/document.el
diff options
context:
space:
mode:
authorKenichi Handa2012-01-21 20:36:42 +0900
committerKenichi Handa2012-01-21 20:36:42 +0900
commit678fb7066698ebfe3aecba722294025ed26da01b (patch)
tree951ac3055141d950974051d13c10e5d7c6a98e31 /lisp/cedet/srecode/document.el
parent71784361eb381ec2b12bd8283724a7addec49079 (diff)
parent959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff)
downloademacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz
emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip
merge trunk
Diffstat (limited to 'lisp/cedet/srecode/document.el')
-rw-r--r--lisp/cedet/srecode/document.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index e25905ead83..1431508fd6d 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -1,6 +1,6 @@
1;;; srecode/document.el --- Documentation (comment) generation 1;;; srecode/document.el --- Documentation (comment) generation
2 2
3;; Copyright (C) 2008-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6 6
@@ -167,7 +167,7 @@ doesn't always work correctly."
167 ("str\\(ing\\)?" . "string") 167 ("str\\(ing\\)?" . "string")
168 ("use?r" . "user") 168 ("use?r" . "user")
169 ("num\\(ber\\)?" . "number") 169 ("num\\(ber\\)?" . "number")
170 ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable 170 ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common syllable
171 ) 171 )
172 "List of common English abbreviations or full words. 172 "List of common English abbreviations or full words.
173These are nouns (as opposed to verbs) for use in creating expanded 173These are nouns (as opposed to verbs) for use in creating expanded