Mercurial > hg > xemacs-beta

changeset 838:bf645ed7cfe3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-05-14 09:28:06 by ben] revert-buffer, others files.el: Andy's patch from 21.4. Fix evil nasty problems with revert-buffer. menubar-items.el: Add Append to Register to Rectangles/Register menu. config.h.in, font-lock.c: Reenable font-lock code since it's used by mouse.el. The flag for this exists in config.h.in but not currently controllable through configure.
author ben
date Tue, 14 May 2002 09:28:14 +0000
parents 0490271de7d8
children 182d9d1c71a5
files lisp/ChangeLog lisp/files.el lisp/menubar-items.el src/ChangeLog src/config.h.in src/emacs.c src/font-lock.c
diffstat 7 files changed, 38 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue May 14 05:30:36 2002 +0000
+++ b/lisp/ChangeLog	Tue May 14 09:28:14 2002 +0000
@@ -1,3 +1,11 @@
+2002-05-13  Ben Wing  <ben@xemacs.org>
+
+	* files.el (revert-buffer):
+	Andy's patch from 21.4.  Fix evil nasty problems with revert-buffer.
+	
+	* menubar-items.el (default-menubar):
+	Add Append to Register to Rectangles/Register menu.
+
 2002-05-13  Adrian Aichner  <adrian@xemacs.org>
 
 	* code-process.el (call-process): Process-related docstring
--- a/lisp/files.el	Tue May 14 05:30:36 2002 +0000
+++ b/lisp/files.el	Tue May 14 09:28:14 2002 +0000
@@ -2861,10 +2861,11 @@
 			(buffer-modified-p)
 			(and (setq newbuf (revert-buffer-internal
 					   file-name))
-			     (and delay-prompt
-				  (yes-or-no-p 
-				   (format "Revert buffer from file %s? "
-					   file-name)))))
+			     (or noconfirm
+				 (and delay-prompt
+				      (yes-or-no-p 
+				       (format "Revert buffer from file %s? "
+					       file-name))))))
 		    ;; If file was backed up but has changed since,
 		    ;; we should make another backup.
 		    (and (not auto-save-p)
--- a/lisp/menubar-items.el	Tue May 14 05:30:36 2002 +0000
+++ b/lisp/menubar-items.el	Tue May 14 09:28:14 2002 +0000
@@ -424,7 +424,7 @@
 
 
      ("C%_mds"
-      ["Repeat Last %_Complex Command..." repeat-complex-command]
+      ["Repeat Last Comple%_x Command..." repeat-complex-command]
       ["E%_valuate Lisp Expression..." eval-expression]
       ["Execute %_Named Command..." execute-extended-command]
       "----"
@@ -432,7 +432,7 @@
        :included (not defining-kbd-macro)]
       ["Stop %_Defining Macro" end-kbd-macro
        :included defining-kbd-macro]
-      ["E%_xecute Last Macro" call-last-kbd-macro
+      ["%_Execute Last Macro" call-last-kbd-macro
        :active last-kbd-macro]
       ("Other %_Macro"
        ["Edit %_Last Macro" edit-last-kbd-macro
@@ -506,12 +506,12 @@
        ["L%_oad Abbrevs..." read-abbrev-file]
        )
 	"---"
-      ["%_Kill Rectangle" kill-rectangle]
+      ["%_Cut Rectangle" kill-rectangle]
       ("Other %_Rectangles/Register"
        ["%_Yank Rectangle" yank-rectangle]
        ["Rectangle %_to Register" copy-rectangle-to-register]
        ["Rectangle %_from Register" insert-register]
-       ["%_Clear Rectangle" clear-rectangle]
+       ["%_Delete Rectangle" clear-rectangle]
        ["%_Open Rectangle" open-rectangle]
        ["%_Prefix Rectangle..." string-rectangle]
        ["Rectangle %_Mousing"
@@ -520,7 +520,8 @@
 	:style toggle :selected mouse-track-rectangle-p]
        "---"
        ["%_Copy to Register..." copy-to-register :active (region-exists-p)]
-       ["%_Paste Register..." insert-register]
+       ["%_Append to Register..." append-register :active (region-exists-p)]
+       ["%_Insert Register..." insert-register]
        "---"
        ["%_Save Point to Register" point-to-register]
        ["%_Jump to Register"  register-to-point]
--- a/src/ChangeLog	Tue May 14 05:30:36 2002 +0000
+++ b/src/ChangeLog	Tue May 14 09:28:14 2002 +0000
@@ -1,3 +1,11 @@
+2002-05-13  Ben Wing  <ben@xemacs.org>
+
+	* config.h.in:
+	* font-lock.c:
+	Reenable font-lock code since it's used by mouse.el.  The flag for
+	this exists in config.h.in but not currently controllable through
+	configure.
+
 2002-05-13  Adrian Aichner  <adrian@xemacs.org>
 
 	* callproc.c: Process-related docstring improvements spurred by
--- a/src/config.h.in	Tue May 14 05:30:36 2002 +0000
+++ b/src/config.h.in	Tue May 14 09:28:14 2002 +0000
@@ -941,6 +941,11 @@
 
 #endif /* WIN32_NO_CONFIGURE */
 
+/* For the moment, we go ahead and keep this, since it's used in mouse.el.
+   #### font-lock does its own version using parse-partial-sexp.  We should
+   merge the two. */
+#define USE_C_FONT_LOCK
+
 #if defined (WIN32_NATIVE) || defined (CYGWIN)
 # define HAVE_WIN32_CODING_SYSTEMS
 #endif
--- a/src/emacs.c	Tue May 14 05:30:36 2002 +0000
+++ b/src/emacs.c	Tue May 14 09:28:14 2002 +0000
@@ -233,7 +233,7 @@
 version 18.59 released October 31, 1992.
 
 */
-
+   
 /* Note: It is necessary to specify <config.h> and not "config.h" in
    order for the --srcdir type of compilation to work properly.
    Otherwise the config.h from the srcdir, rather than the one from
--- a/src/font-lock.c	Tue May 14 05:30:36 2002 +0000
+++ b/src/font-lock.c	Tue May 14 09:28:14 2002 +0000
@@ -44,9 +44,10 @@
    This way there would be no guessing or incorrect results.
  */
 
-#if 0 /* no longer used */
+#include <config.h>
 
-#include <config.h>
+#ifdef USE_C_FONT_LOCK
+
 #include "lisp.h"
 
 #include "buffer.h"
@@ -842,4 +843,5 @@
 {
   reinit_vars_of_font_lock ();
 }
-#endif /* 0 */
+
+#endif /* USE_C_FONT_LOCK */