#3 Fix emacs xcscope problem due to calling obsolete function process-kill-without-query
Opened 2 months ago by laine. Modified 2 months ago
rpms/ laine/cscope master  into  rawhide

@@ -0,0 +1,85 @@ 

+ From eaea31cb93ecddda69a373f83f632e1a450c3c90 Mon Sep 17 00:00:00 2001

+ From: Brock Zheng Techyauld Ltd <yzheng@techyauld.com>

+ Date: Tue, 25 Aug 2020 20:28:11 +0800

+ Subject: [PATCH] emacs plugin fixup: GNU/Emacs 27.1 removes function

+  process-kill-without-query

+ 

+ cherry-picked from upstream:

+ 

+ https://sourceforge.net/p/cscope/cscope/ci/eaea31cb93ecddda69a373f83f632e1a450c3c90/

+ 

+ Signed-off-by: Laine Stump <laine@redhat.com>

+ ---

+  contrib/xcscope/xcscope.el | 14 +++++++-------

+  1 file changed, 7 insertions(+), 7 deletions(-)

+ 

+ diff --git a/contrib/xcscope/xcscope.el b/contrib/xcscope/xcscope.el

+ index 0e814ea..859dff5 100644

+ --- a/contrib/xcscope/xcscope.el

+ +++ b/contrib/xcscope/xcscope.el

+ @@ -180,7 +180,7 @@

+  ;; variable is used to determine the mapping.  One use for this

+  ;; variable is when you want to share the database file with other

+  ;; users; in this case, the database may be located in a directory

+ -;; separate from the source files.  

+ +;; separate from the source files.

+  ;;

+  ;; Setting the variable, `cscope-initial-directory', is useful when a

+  ;; search is to be expanded by specifying a cscope database directory

+ @@ -366,7 +366,7 @@

+  ;;      disable automatic database creation, updating, and

+  ;;      maintenance.

+  ;;

+ -;; "cscope-display-cscope-buffer" 

+ +;; "cscope-display-cscope-buffer"

+  ;;      If non-nil, display the *cscope* buffer after each search

+  ;;      (default).  This variable can be set in order to reduce the

+  ;;      number of keystrokes required to navigate through the matches.

+ @@ -1233,7 +1233,7 @@ directory should begin.")

+  			:style toggle :selected cscope-use-relative-paths ]

+  		      [ "No mouse prompts" (setq cscope-no-mouse-prompts

+  						 (not cscope-no-mouse-prompts))

+ -			:style toggle :selected cscope-no-mouse-prompts ] 

+ +			:style toggle :selected cscope-no-mouse-prompts ]

+  		      )

+  		    ))

+  

+ @@ -1291,7 +1291,7 @@ The text properties to be added:

+    )

+  

+  

+ -(defun cscope-show-entry-internal (file line-number 

+ +(defun cscope-show-entry-internal (file line-number

+  					&optional save-mark-p window arrow-p)

+    "Display the buffer corresponding to FILE and LINE-NUMBER

+  in some window.  If optional argument WINDOW is given,

+ @@ -1943,7 +1943,7 @@ using the mouse."

+  			    cscope-directory

+  			    (file-name-directory cscope-directory))

+  		      ))

+ -		(setq cscope-directory 

+ +		(setq cscope-directory

+  		      (file-name-as-directory cscope-directory))

+  		(if (not (member cscope-directory cscope-searched-dirs))

+  		    (progn

+ @@ -2006,7 +2006,7 @@ using the mouse."

+  	      (set-process-filter cscope-process cscope-filter-func)

+  	      (set-process-sentinel cscope-process cscope-sentinel-func)

+  	      (set-marker (process-mark cscope-process) (point))

+ -	      (process-kill-without-query cscope-process)

+ +              (set-process-query-on-exit-flag cscope-process nil)

+  	      (if cscope-running-in-xemacs

+  		  (setq modeline-process ": Searching ..."))

+  	      (setq buffer-read-only t)

+ @@ -2139,7 +2139,7 @@ SENTINEL-FUNC are optional process filter and sentinel, respectively."

+  		   cscope-indexing-script args))

+        (set-process-sentinel cscope-unix-index-process

+  			    'cscope-unix-index-files-sentinel)

+ -      (process-kill-without-query cscope-unix-index-process)

+ +      (set-process-query-on-exit-flag cscope-unix-index-process nil)

+        )

+      ))

+  

+ -- 

+ 2.29.2

+ 

file modified
+6 -1
@@ -1,7 +1,7 @@ 

  Summary: C source code tree search and browse tool 

  Name: cscope

  Version: 15.9

- Release: 8%{?dist}

+ Release: 9%{?dist}

  Source0: https://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz

  URL: http://cscope.sourceforge.net

  License: BSD and GPLv2+
@@ -16,6 +16,7 @@ 

  %endif

  

  Patch1: cscope-dblfree.patch

+ Patch2: cscope-emacs-plugin-fixup-GNU-Emacs-27.1-removes-function-p.patch

  

  %define cscope_share_path %{_datadir}/cscope

  %define xemacs_lisp_path %{_datadir}/xemacs/site-packages/lisp
@@ -33,6 +34,7 @@ 

  %prep

  %setup -q

  %patch1 -p1 

+ %patch2 -p1

  

  autoreconf

  
@@ -91,6 +93,9 @@ 

  rm -f %{vim_plugin_path}/cctree.vim

  

  %changelog

+ * Wed Jan 13 2020 Laine Stump <laine@redhat.com> - 15.9-9

+ - remove call to obsolete elisp process-kill-without-query (bz 1874898)

+ 

  * Wed Jul 29 2020 Neil Horman <nhorman@redhat.com> - 15.9-8

  - Adding missing dependency on ed (bz 1861697)

  

Resolves: 1874898

Signed-off-by: Laine Stump laine@redhat.com

This should also be cherry-picked to the f32 and f33 branches and updates submitted, since those both have emacs 27.1 (so the emacs cscope addon is completely non-functional), and they are still within maintenance, so this is fixing a serious regression.