|
 |
b93632 |
From eaea31cb93ecddda69a373f83f632e1a450c3c90 Mon Sep 17 00:00:00 2001
|
|
|
b93632 |
From: Brock Zheng Techyauld Ltd <yzheng@techyauld.com>
|
|
|
b93632 |
Date: Tue, 25 Aug 2020 20:28:11 +0800
|
|
|
b93632 |
Subject: [PATCH 9/9] emacs plugin fixup: GNU/Emacs 27.1 removes function
|
|
|
b93632 |
process-kill-without-query
|
|
|
b93632 |
|
|
|
b93632 |
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
|
|
|
b93632 |
---
|
|
|
b93632 |
contrib/xcscope/xcscope.el | 14 +++++++-------
|
|
|
b93632 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
b93632 |
|
|
|
b93632 |
diff --git a/contrib/xcscope/xcscope.el b/contrib/xcscope/xcscope.el
|
|
|
b93632 |
index 0e814ea..859dff5 100644
|
|
|
b93632 |
--- a/contrib/xcscope/xcscope.el
|
|
|
b93632 |
+++ b/contrib/xcscope/xcscope.el
|
|
|
b93632 |
@@ -180,7 +180,7 @@
|
|
|
b93632 |
;; variable is used to determine the mapping. One use for this
|
|
|
b93632 |
;; variable is when you want to share the database file with other
|
|
|
b93632 |
;; users; in this case, the database may be located in a directory
|
|
|
b93632 |
-;; separate from the source files.
|
|
|
b93632 |
+;; separate from the source files.
|
|
|
b93632 |
;;
|
|
|
b93632 |
;; Setting the variable, `cscope-initial-directory', is useful when a
|
|
|
b93632 |
;; search is to be expanded by specifying a cscope database directory
|
|
|
b93632 |
@@ -366,7 +366,7 @@
|
|
|
b93632 |
;; disable automatic database creation, updating, and
|
|
|
b93632 |
;; maintenance.
|
|
|
b93632 |
;;
|
|
|
b93632 |
-;; "cscope-display-cscope-buffer"
|
|
|
b93632 |
+;; "cscope-display-cscope-buffer"
|
|
|
b93632 |
;; If non-nil, display the *cscope* buffer after each search
|
|
|
b93632 |
;; (default). This variable can be set in order to reduce the
|
|
|
b93632 |
;; number of keystrokes required to navigate through the matches.
|
|
|
b93632 |
@@ -1233,7 +1233,7 @@ directory should begin.")
|
|
|
b93632 |
:style toggle :selected cscope-use-relative-paths ]
|
|
|
b93632 |
[ "No mouse prompts" (setq cscope-no-mouse-prompts
|
|
|
b93632 |
(not cscope-no-mouse-prompts))
|
|
|
b93632 |
- :style toggle :selected cscope-no-mouse-prompts ]
|
|
|
b93632 |
+ :style toggle :selected cscope-no-mouse-prompts ]
|
|
|
b93632 |
)
|
|
|
b93632 |
))
|
|
|
b93632 |
|
|
|
b93632 |
@@ -1291,7 +1291,7 @@ The text properties to be added:
|
|
|
b93632 |
)
|
|
|
b93632 |
|
|
|
b93632 |
|
|
|
b93632 |
-(defun cscope-show-entry-internal (file line-number
|
|
|
b93632 |
+(defun cscope-show-entry-internal (file line-number
|
|
|
b93632 |
&optional save-mark-p window arrow-p)
|
|
|
b93632 |
"Display the buffer corresponding to FILE and LINE-NUMBER
|
|
|
b93632 |
in some window. If optional argument WINDOW is given,
|
|
|
b93632 |
@@ -1943,7 +1943,7 @@ using the mouse."
|
|
|
b93632 |
cscope-directory
|
|
|
b93632 |
(file-name-directory cscope-directory))
|
|
|
b93632 |
))
|
|
|
b93632 |
- (setq cscope-directory
|
|
|
b93632 |
+ (setq cscope-directory
|
|
|
b93632 |
(file-name-as-directory cscope-directory))
|
|
|
b93632 |
(if (not (member cscope-directory cscope-searched-dirs))
|
|
|
b93632 |
(progn
|
|
|
b93632 |
@@ -2006,7 +2006,7 @@ using the mouse."
|
|
|
b93632 |
(set-process-filter cscope-process cscope-filter-func)
|
|
|
b93632 |
(set-process-sentinel cscope-process cscope-sentinel-func)
|
|
|
b93632 |
(set-marker (process-mark cscope-process) (point))
|
|
|
b93632 |
- (process-kill-without-query cscope-process)
|
|
|
b93632 |
+ (set-process-query-on-exit-flag cscope-process nil)
|
|
|
b93632 |
(if cscope-running-in-xemacs
|
|
|
b93632 |
(setq modeline-process ": Searching ..."))
|
|
|
b93632 |
(setq buffer-read-only t)
|
|
|
b93632 |
@@ -2139,7 +2139,7 @@ SENTINEL-FUNC are optional process filter and sentinel, respectively."
|
|
|
b93632 |
cscope-indexing-script args))
|
|
|
b93632 |
(set-process-sentinel cscope-unix-index-process
|
|
|
b93632 |
'cscope-unix-index-files-sentinel)
|
|
|
b93632 |
- (process-kill-without-query cscope-unix-index-process)
|
|
|
b93632 |
+ (set-process-query-on-exit-flag cscope-unix-index-process nil)
|
|
|
b93632 |
)
|
|
|
b93632 |
))
|
|
|
b93632 |
|
|
|
b93632 |
--
|
|
|
b93632 |
2.26.2
|
|
|
b93632 |
|