aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode
diff options
context:
space:
mode:
authorJan D2015-05-23 12:28:54 +0200
committerJan D2015-05-23 12:28:54 +0200
commit6aaa489dc112f51f6045f79b37cb78dd513e398f (patch)
treea34eb6ad435ab877848f7464374570549ca55ec5 /lisp/cedet/srecode
parentee14727ce033bae3bc11af35e7843604e5a5e635 (diff)
parent7ac84a2570e1268cc040fcd529508307b2b22c01 (diff)
downloademacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.tar.gz
emacs-6aaa489dc112f51f6045f79b37cb78dd513e398f.zip
Merge branch 'master' into cairo
Diffstat (limited to 'lisp/cedet/srecode')
-rw-r--r--lisp/cedet/srecode/cpp.el2
-rw-r--r--lisp/cedet/srecode/texi.el10
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index ec92ae30ba6..e77e05c40b9 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -84,7 +84,7 @@ HEADER - Shown section if in a header file."
84;;;###autoload 84;;;###autoload
85(defun srecode-semantic-handle-:cpp (dict) 85(defun srecode-semantic-handle-:cpp (dict)
86 "Add macros into the dictionary DICT based on the current c file. 86 "Add macros into the dictionary DICT based on the current c file.
87Calls `srecode-semantic-handle-:c. 87Calls `srecode-semantic-handle-:c'.
88Also adds the following: 88Also adds the following:
89 - nothing -" 89 - nothing -"
90 (srecode-semantic-handle-:c dict) 90 (srecode-semantic-handle-:c dict)
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 5c3f21c32a2..be75f3765c1 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -241,11 +241,11 @@ This is to take advantage of TeXinfo's markup symbols."
241For instances where CLASS is the class being referenced, do not Xref 241For instances where CLASS is the class being referenced, do not Xref
242that class. 242that class.
243 243
244 `function' => @dfn{function} 244 function => @dfn{function}
245 `variable' => @code{variable} 245 variable => @code{variable}
246 `class' => @code{class} @xref{class} 246 class => @code{class} @xref{class}
247 `unknown' => @code{unknown} 247 unknown => @code{unknown}
248 \"text\" => ``text'' 248 \" text \" => `` text ''
249 'quoteme => @code{quoteme} 249 'quoteme => @code{quoteme}
250 non-nil => non-@code{nil} 250 non-nil => non-@code{nil}
251 t => @code{t} 251 t => @code{t}