[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/scripts/kde-emacs
From:       Raphael Kubo da Costa <rakuco () FreeBSD ! org>
Date:       2011-10-17 15:22:22
Message-ID: 20111017152222.3ECF8AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1259303 by rkcosta:

kde-emacs: Prevent the pc-select code from being enabled in GNU Emacs 24+.

GNU Emacs 24+ has deprecated the pc-select mode (users should use
shift-select-mode, which is enabled by default, instead).

Make the code which enables pc-select mode have any effect only if we're not
using GNU Emacs 24+.

Reviewed-by: dfaure, winterz


 M  +4 -2      kde-emacs-utils.el  
 M  +1 -1      kde-emacs-vars.el  


--- trunk/KDE/kdesdk/scripts/kde-emacs/kde-emacs-utils.el #1259302:1259303
@@ -704,13 +704,15 @@
     (compile (concat kde-emacs-make " " f)))
   )
 
-;; pc-like textmarking
+;; pc-like textmarking, deprecated in GNU Emacs 24+.
+(when (not (and (eq kde-emacs-type 'emacs)
+                (>= emacs-major-version 24)))
 (when kde-use-pc-select
   (progn
     (load "pc-select")
     (if (eq kde-emacs-type 'xemacs)
        (funcall 'pc-select-mode)
-      (funcall 'pc-selection-mode))))
+        (funcall 'pc-selection-mode)))))
 
 
 ; Move in other window
--- trunk/KDE/kdesdk/scripts/kde-emacs/kde-emacs-vars.el #1259302:1259303
@@ -105,7 +105,7 @@
   :type 'string)
 
 (defcustom kde-use-pc-select 't
-  "Set this to nil if you really hate PC Select Mode..."
+  "Set this to nil if you really hate PC Select Mode. Does not have any effect on \
GNU Emacs 24+ (shift-select-mode, enabled by default, should be used instead)."  \
:group 'kde-devel  :type 'boolean)
 


[prev in list] [next in list] [prev in thread] [next in thread]