diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-28 09:38:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-28 09:38:22 -0700 |
| commit | 7d8234c0cb9daac31ae2f660f503a3ede7324549 (patch) | |
| tree | 62529bfe7a2ba90f934f416031cbc62930f7124f /lisp/cedet | |
| parent | e6bb547353915b376b663fda32f88d1bf8f24d1f (diff) | |
| parent | 9bff405d09f6eeeb577e6e0111e49f35d3b95b52 (diff) | |
| download | emacs-7d8234c0cb9daac31ae2f660f503a3ede7324549.tar.gz | |
Merge from origin/emacs-26
9bff405 (origin/emacs-26) * doc/misc/org.texi (Installation): Fix clo...
613c9a5 Update Org to v9.1.9
1b075a9 ; Fix some tiny doc typos
441fe20 De-obsolete `if-let' and `when-let'
8696038 * lisp/htmlfontify.el (hfy-begin-span-handler): Doc fix.
930f7b1 * doc/lispref/functions.texi (Defining Functions): Improve in...
95ccf50 Fix crash after frame is freed on macOS (bug#30800)
45d0475 More manual editing
2acb9f0 Minor manual changes changes
d481cba * lisp/calculator.el (calculator-paste-decimals): Add version.
7d6c7d0 ; Use GNU not Gnu in docs
1bc4def More proofreading of the Emacs manual
Conflicts:
doc/misc/org.texi
etc/NEWS
lisp/org/org-clock.el
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/cedet-global.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/locate.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el index ad05af241da..a0e88136e27 100644 --- a/lisp/cedet/cedet-global.el +++ b/lisp/cedet/cedet-global.el @@ -105,7 +105,7 @@ SCOPE is the scope of the search, such as 'project or 'subdirs." (defun cedet-gnu-global-expand-filename (filename) "Expand the FILENAME with GNU Global. Return a list of absolute filenames or nil if none found. -Signal an error if Gnu global not available." +Signal an error if GNU global not available." (interactive "sFile: ") (let ((ans (with-current-buffer (cedet-gnu-global-call (list "-Pa" filename)) (goto-char (point-min)) diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el index fbc8dc8f8ff..c1c48510483 100644 --- a/lisp/cedet/ede/locate.el +++ b/lisp/cedet/ede/locate.el @@ -246,7 +246,7 @@ variable `cedet-global-command'.") (cl-defmethod ede-locate-file-in-project-impl ((loc ede-locate-global) filesubstring) - "Locate occurrences of FILESUBSTRING in LOC, using Gnu Global." + "Locate occurrences of FILESUBSTRING in LOC, using GNU Global." (require 'cedet-global) (let ((default-directory (oref loc root))) (cedet-gnu-global-expand-filename filesubstring))) |