From b8433b0954b26d4620a3154be025fb8a49a73954 Mon Sep 17 00:00:00 2001 From: Bastian Beischer Date: Thu, 19 Oct 2017 02:44:46 +0300 Subject: Use pop-to-buffer-same-window instead of switch-to-buffer * lisp/cedet/semantic/decorate/include.el (semantic-decoration-include-visit): Use pop-to-buffer-same-window instead of switch-to-buffer (bug#28645). * lisp/cedet/semantic/analyze/refs.el (semantic-analyze-proto-impl-toggle): Same. * lisp/cedet/semantic/senator.el (senator-go-to-up-reference): Same. * lisp/cedet/semantic/mru-bookmark.el (semantic-mrub-visit): Same. * lisp/cedet/semantic/complete.el (semantic-complete-jump): Same. Copyright-paperwork-exempt: yes --- lisp/cedet/semantic/analyze/refs.el | 2 +- lisp/cedet/semantic/complete.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/mru-bookmark.el | 2 +- lisp/cedet/semantic/senator.el | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lisp/cedet/semantic') diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el index 55fcd830433..a58479f5054 100644 --- a/lisp/cedet/semantic/analyze/refs.el +++ b/lisp/cedet/semantic/analyze/refs.el @@ -348,7 +348,7 @@ Only works for tags in the global namespace." (push-mark) (semantic-go-to-tag target) - (switch-to-buffer (current-buffer)) + (pop-to-buffer-same-windown (current-buffer)) (semantic-momentary-highlight-tag target)) ) diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index ff8e61e54dc..325ca1f4414 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -2120,7 +2120,7 @@ completion works." (when (semantic-tag-p tag) (push-mark) (semantic-go-to-tag tag) - (switch-to-buffer (current-buffer)) + (pop-to-buffer-same-window (current-buffer)) (semantic-momentary-highlight-tag tag) (message "%S: %s " (semantic-tag-class tag) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 6876e5f3a46..9f1825d4208 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -467,7 +467,7 @@ its contents. (error "Could not location include %s" (semantic-tag-name tag))) ((get-file-buffer file) - (switch-to-buffer (get-file-buffer file))) + (pop-to-buffer-same-window (get-file-buffer file))) ((stringp file) (find-file file)) )))) diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el index 5fa58e08ea6..24863de01b1 100644 --- a/lisp/cedet/semantic/mru-bookmark.el +++ b/lisp/cedet/semantic/mru-bookmark.el @@ -113,7 +113,7 @@ Uses `semantic-go-to-tag' and highlighting." (forward-char o)) (error nil)) ;; make it visible - (switch-to-buffer (current-buffer)) + (pop-to-buffer-same-window (current-buffer)) (semantic-momentary-highlight-tag tag) )) diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el index e86658628b5..70e04475ab2 100644 --- a/lisp/cedet/semantic/senator.el +++ b/lisp/cedet/semantic/senator.el @@ -530,11 +530,11 @@ Some tags such as includes have other reference features." ;; A tag ((semantic-tag-p result) (semantic-go-to-tag result) - (switch-to-buffer (current-buffer)) + (pop-to-buffer-same-window (current-buffer)) (semantic-momentary-highlight-tag result)) ;; Buffers ((bufferp result) - (switch-to-buffer result) + (pop-to-buffer-same-window result) (pulse-momentary-highlight-one-line (point))) ;; Files ((and (stringp result) (file-exists-p result)) -- cgit v1.2.3 From 6f1dea5c74057707bf367f863a8be5750bbb6094 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 18 Oct 2017 18:43:00 -0700 Subject: Spelling fixes * lisp/cedet/semantic/analyze/refs.el: (semantic-analyze-proto-impl-toggle): Fix recently-introduced misspelling of pop-to-buffer-same-window. --- ChangeLog.3 | 6 +++--- doc/misc/flymake.texi | 4 ++-- lib-src/ChangeLog.1 | 2 +- lisp/cedet/semantic/analyze/refs.el | 2 +- msdos/sedlibmk.inp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lisp/cedet/semantic') diff --git a/ChangeLog.3 b/ChangeLog.3 index 811b6dbad76..2d7f3bbf3a2 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -926,7 +926,7 @@ constrained to call REPORT-FN exactly once. It may do so any number of times, cumulatively reporting diagnostics. Flymake keeps track of outdated REPORT-FN instances and disconsiders obsolete reports. - Backends should avoid reporting obsolete data by cancelling any + Backends should avoid reporting obsolete data by canceling any ongoing processing at every renewed call to the backend function. Consolidated flymake.el internal data structures to require less @@ -18314,7 +18314,7 @@ Throw a `search-failed' derived error in Info search - The original fix for Bug#6106 switched from signalling `search-failed' + The original fix for Bug#6106 switched from signaling `search-failed' to `user-error'. However, this breaks incremental searching over multiple nodes because the isearch code doesn't expect a `user-error'. @@ -28599,7 +28599,7 @@ http://trac.common-lisp.net/bordeaux-threads/wiki/ApiDocumentation ... but not identically. In particular I chose not to implement - interrupt-thread or destroy-thread, but instead a thread-signalling + interrupt-thread or destroy-thread, but instead a thread-signaling approach. I'm still undecided about *default-special-bindings* (which I did not diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 05d879d8f4b..99ab1271ac9 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -560,7 +560,7 @@ Binding,,, elisp, The Emacs Lisp Reference Manual}) to be active. (defun ruby-flymake (report-fn &rest _args) ;; Not having a ruby interpreter is a serious problem which should cause - ;; the backend to disable itself, so an @code{error} is signalled. + ;; the backend to disable itself, so an @code{error} is signaled. ;; (unless (executable-find "ruby") (error "Cannot find a suitable ruby")) @@ -625,7 +625,7 @@ Binding,,, elisp, The Emacs Lisp Reference Manual}) to be active. msg) into diags finally (funcall report-fn diags))) - (flymake-log :warning "Cancelling obsolete check %s" + (flymake-log :warning "Canceling obsolete check %s" proc)) ;; Cleanup the temporary buffer used to hold the ;; check's output. diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index 4b5422e712c..5a370035d70 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 @@ -5643,7 +5643,7 @@ 1998-04-06 Andreas Schwab Silence -Wimplicit: - * movemail.c: Move cancelations up. Include if + * movemail.c: Move cancellations up. Include if available. * fakemail.c (_XOPEN_SOURCE): Define for declaration of cuserid. (parse_header): Explicitly declare return type. diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el index a58479f5054..6ebf130d305 100644 --- a/lisp/cedet/semantic/analyze/refs.el +++ b/lisp/cedet/semantic/analyze/refs.el @@ -348,7 +348,7 @@ Only works for tags in the global namespace." (push-mark) (semantic-go-to-tag target) - (pop-to-buffer-same-windown (current-buffer)) + (pop-to-buffer-same-window (current-buffer)) (semantic-momentary-highlight-tag target)) ) diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 30776b46d7e..27072e25a6c 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -45,7 +45,7 @@ # ifneq (,$(GL_GENERATE_xxxx_H)) # Depending on whether DJGPP uses the corresponding header, these # should be edited either to 1 (thus exposing the recipe) or -# to notyhing, which makes Make bypass the recipe away. Example: +# to nothing, which makes Make bypass the recipe away. Example: # # s/^@GL_GENERATE_STDBOOL_H@/1/ # s/^@GL_GENERATE_STDINT_H@// -- cgit v1.2.3 From 25f83fa7c527f318b6e53c8a9ae32bdc629b32c2 Mon Sep 17 00:00:00 2001 From: Bastian Beischer Date: Thu, 19 Oct 2017 13:03:11 +0300 Subject: ; Indentation fixes --- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/senator.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp/cedet/semantic') diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 9f1825d4208..975ba343469 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -467,7 +467,7 @@ its contents. (error "Could not location include %s" (semantic-tag-name tag))) ((get-file-buffer file) - (pop-to-buffer-same-window (get-file-buffer file))) + (pop-to-buffer-same-window (get-file-buffer file))) ((stringp file) (find-file file)) )))) diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el index 70e04475ab2..ea796dd19f9 100644 --- a/lisp/cedet/semantic/senator.el +++ b/lisp/cedet/semantic/senator.el @@ -530,11 +530,11 @@ Some tags such as includes have other reference features." ;; A tag ((semantic-tag-p result) (semantic-go-to-tag result) - (pop-to-buffer-same-window (current-buffer)) + (pop-to-buffer-same-window (current-buffer)) (semantic-momentary-highlight-tag result)) ;; Buffers ((bufferp result) - (pop-to-buffer-same-window result) + (pop-to-buffer-same-window result) (pulse-momentary-highlight-one-line (point))) ;; Files ((and (stringp result) (file-exists-p result)) -- cgit v1.2.3