Mercurial > hg > xemacs-beta

diff lisp/utils/skeleton.el @ 70:131b0175ea99 r20-0b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 56c54cf7c5b6
children 1040fe1366ac
line wrap: on
line diff
--- a/lisp/utils/skeleton.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/utils/skeleton.el	Mon Aug 13 09:02:59 2007 +0200
@@ -165,7 +165,6 @@
 			 (and skeleton-autowrap
 			      (or (eq last-command 'mouse-drag-region)
 				  (and (boundp 'transient-mark-mode)
-				       (boundp 'mark-active)
 				       transient-mark-mode mark-active))
 			      -1)))
 		     (if (stringp str)
@@ -212,7 +211,6 @@
 			   (and skeleton-autowrap
 				(or (eq last-command 'mouse-drag-region)
 				    (and (boundp 'transient-mark-mode)
-					 (boundp 'mark-active)
 					 transient-mark-mode mark-active))
 				-1)))
 		       (if (stringp str)
@@ -393,8 +391,7 @@
 
 
 (defun skeleton-internal-1 (element &optional literal)
-  (cond ((or (integerp element)
-	     (char-or-string-p element))
+  (cond ((char-or-string-p element)
 	 (if (and (integerp element)	; -num
 		  (< element 0))
 	     (if skeleton-untabify
@@ -520,7 +517,6 @@
   (let ((mark (and skeleton-autowrap
 		   (or (eq last-command 'mouse-drag-region)
 		       (and (boundp 'transient-mark-mode)
-			    (boundp 'mark-active)
 			    transient-mark-mode mark-active))))
 	(skeleton-end-hook))
     (if (or arg