diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-02-02 19:19:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-02-02 19:19:08 +0000 |
| commit | d3a6748c5b378a86fc8408222c7dd26e47218af9 (patch) | |
| tree | 33f9334088634447425b8c926dd45d1e83fa80e2 /lisp/emacs-lisp/easy-mmode.el | |
| parent | 465fc071a1aa48e87f37bff460410eec921eaa53 (diff) | |
| parent | d83a97ab5fbcde063e4a87042cd721a23f13fbe0 (diff) | |
| download | emacs-d3a6748c5b378a86fc8408222c7dd26e47218af9.tar.gz emacs-d3a6748c5b378a86fc8408222c7dd26e47218af9.tar.bz2 emacs-d3a6748c5b378a86fc8408222c7dd26e47218af9.zip | |
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-57
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-58
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-59
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-60
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-61
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-62
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-63
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-64
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-65
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-66
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-67
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-68
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-69
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-71
Diffstat (limited to 'lisp/emacs-lisp/easy-mmode.el')
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 01e3e0af5ac..2439fdd4de6 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -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 @@ found, do widen first and then call NARROWFUN with no args after moving." (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 @@ found, do widen first and then call NARROWFUN with no args after moving." (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 @@ found, do widen first and then call NARROWFUN with no args after moving." (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)) |