Mercurial > emacs

changeset 53733:d5f680b60b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(easy-mmode-define-navigation): Use a more robust check of widening.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 27 Jan 2004 22:54:45 +0000
parents 0341435e76ce
children 132739917566
files lisp/emacs-lisp/easy-mmode.el
diffstat 1 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emacs-lisp/easy-mmode.el	Tue Jan 27 21:34:43 2004 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el	Tue Jan 27 22:54:45 2004 +0000
@@ -1,6 +1,6 @@
 ;;; easy-mmode.el --- easy definition for major and minor modes
 
-;; Copyright (C) 1997, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1997,2000,01,02,03,2004  Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
@@ -433,14 +433,13 @@
   (let* ((base-name (symbol-name base))
 	 (prev-sym (intern (concat base-name "-prev")))
 	 (next-sym (intern (concat base-name "-next")))
-         (check-narrow-maybe (when narrowfun
-                               '(setq was-narrowed-p
-                                      (prog1 (or (/= (point-min) 1)
-                                                 (/= (point-max)
-                                                     (1+ (buffer-size))))
-                                        (widen)))))
+         (check-narrow-maybe
+	  (when narrowfun
+	    '(setq was-narrowed
+		   (prog1 (or (< (- (point-max) (point-min)) (buffer-size)))
+		     (widen)))))
          (re-narrow-maybe (when narrowfun
-                            `(when was-narrowed-p (,narrowfun)))))
+                            `(when was-narrowed (,narrowfun)))))
     (unless name (setq name base-name))
     `(progn
        (add-to-list 'debug-ignored-errors
@@ -451,7 +450,7 @@
 	 (unless count (setq count 1))
 	 (if (< count 0) (,prev-sym (- count))
 	   (if (looking-at ,re) (setq count (1+ count)))
-           (let (was-narrowed-p)
+           (let (was-narrowed)
              ,check-narrow-maybe
              (if (not (re-search-forward ,re nil t count))
                  (if (looking-at ,re)
@@ -472,7 +471,7 @@
 	 (interactive)
 	 (unless count (setq count 1))
 	 (if (< count 0) (,next-sym (- count))
-           (let (was-narrowed-p)
+           (let (was-narrowed)
              ,check-narrow-maybe
              (unless (re-search-backward ,re nil t count)
                (error "No previous %s" ,name))