Refreshing Info nodes

Refreshing Info nodes

[Wojciech Meyer]

Hi,

Is there anyway to refresh an Info node?

Currently I have to revisit a toplevel Info node to see my changes, I
would like to be able to do it with just one command (like a refresh
button in a browser) being in info section, is it possible?

Thanks.

Wojciech

Re: Refreshing Info nodes

[Deniz Dogan]

2010/6/13 Wojciech Meyer <wojciech.meyer@googlemail.com>:
> Hi,
>
> Is there anyway to refresh an Info node?
>
> Currently I have to revisit a toplevel Info node to see my changes, I
> would like to be able to do it with just one command (like a refresh
> button in a browser) being in info section, is it possible?
>

I don't know of any binding which does this, but you can use
`Info-revert-buffer-function', or `Info-revert-find-node' directly.
Neither of these functions are commands though.

-- 
Deniz Dogan

Re: Refreshing Info nodes

[Juri Linkov]

>> Is there anyway to refresh an Info node?
>>
>> Currently I have to revisit a toplevel Info node to see my changes, I
>> would like to be able to do it with just one command (like a refresh
>> button in a browser) being in info section, is it possible?
>
> I don't know of any binding which does this, but you can use
> `Info-revert-buffer-function', or `Info-revert-find-node' directly.
> Neither of these functions are commands though.

The standard key binding to revert is `g', but in Info it's bound
to `Info-goto-node'.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Wojciech Meyer]

Juri Linkov <juri@jurta.org> writes:

>> I don't know of any binding which does this, but you can use
>> `Info-revert-buffer-function', or `Info-revert-find-node' directly.
>> Neither of these functions are commands though.
>
> The standard key binding to revert is `g', but in Info it's bound
> to `Info-goto-node'.

Yes, I've rebound it to F5 temporally, thanks. I think it is quite
uncommon to refresh the Info node, unless somebody is working on
documentation.  (perhaps less common than `g' in dired-mode for
instance).

Wojciech

Re: Refreshing Info nodes

[Stefan Monnier]

>> I don't know of any binding which does this, but you can use
>> `Info-revert-buffer-function', or `Info-revert-find-node' directly.
>> Neither of these functions are commands though.
> The standard key binding to revert is `g', but in Info it's bound
> to `Info-goto-node'.

Even if g can't be used because it's used for something else,
M-x revert-buffer RET should either work already or be made to work.


        Stefan

Re: Refreshing Info nodes

[joakim]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>> I don't know of any binding which does this, but you can use
>>> `Info-revert-buffer-function', or `Info-revert-find-node' directly.
>>> Neither of these functions are commands though.
>> The standard key binding to revert is `g', but in Info it's bound
>> to `Info-goto-node'.
>
> Even if g can't be used because it's used for something else,
> M-x revert-buffer RET should either work already or be made to work.
>
>
>         Stefan

I find the inconsistency of "g" to be rather annoying.
I think it should work also in variable help buffers, etc.

-- 
Joakim Verona

Re: Refreshing Info nodes

[Juri Linkov]

> Even if g can't be used because it's used for something else,
> M-x revert-buffer RET should either work already or be made to work.

It doesn't work correctly, so it should be made to work.
It fails when the Info buffer has a non-default buffer name,
e.g. "*info*<1>".  In this case `Info-revert-find-node'
pops a new empty buffer "*info*", reads nil values of Info variables,
and kills that empty buffer.  Then after reverting "*info*<1>",
it puts these nil values to Info variables of "*info*<1>"
(Info-history, etc.)

Perhaps a `(eq major-mode 'Info-mode)' check should be added
before `(pop-to-buffer "*info*")' in `Info-revert-find-node'
like in other Info commands.  And it needs to keep the original
buffer name.  I'll try to fix this.


-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Juri Linkov]

> I find the inconsistency of "g" to be rather annoying.

We have a prefix map M-g specially for "goto" commands.
Maybe `M-g n' should be bound to `Info-goto-node'.
Or like in Dired, bind it to `j'.

> I think it should work also in variable help buffers, etc.

`revert-buffer-function' is not implemented for Help buffers at all.
And what is worse, in Help mode `g' is bound to `View-goto-line'.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[joakim]

Juri Linkov <juri@jurta.org> writes:

>> I find the inconsistency of "g" to be rather annoying.
>
> We have a prefix map M-g specially for "goto" commands.
> Maybe `M-g n' should be bound to `Info-goto-node'.
> Or like in Dired, bind it to `j'.
>
>> I think it should work also in variable help buffers, etc.
>
> `revert-buffer-function' is not implemented for Help buffers at all.
> And what is worse, in Help mode `g' is bound to `View-goto-line'.

I think  back(last)/up/g/j should be consistent in at least these modes:

"help" buffer
dired
info
w3m

(I think this is still on-topic, but make a new thread if not)

-- 
Joakim Verona

Re: Refreshing Info nodes

[Stefan Monnier]

>> I think it should work also in variable help buffers, etc.
> `revert-buffer-function' is not implemented for Help buffers at all.

Indeed and that's a bug.


        Stefan

Re: Refreshing Info nodes

[Stefan Monnier]

> Perhaps a `(eq major-mode 'Info-mode)' check should be added
> before `(pop-to-buffer "*info*")' in `Info-revert-find-node'
> like in other Info commands.

I'd rather check something more directly and explicitly related to
reverting that just (derived-mode-p 'Info-mode).  Ideally there should
be no check: the code that does the pop-to-buffer should simply not be
used at all when reverting, instead the non-reverting case should create
a *info* buffer, setup the few needed vars and then trigger
`revert-buffer' to do the actual work.


        Stefan

Re: Refreshing Info nodes

[Eli Zaretskii]

> From: Juri Linkov <juri@jurta.org>
> Date: Tue, 15 Jun 2010 00:59:34 +0300
> Cc: emacs-devel@gnu.org, Wojciech Meyer <wojciech.meyer@googlemail.com>,
> 	Stefan Monnier <monnier@iro.umontreal.ca>,
> 	Deniz Dogan <deniz.a.m.dogan@gmail.com>
> 
> > I find the inconsistency of "g" to be rather annoying.
> 
> We have a prefix map M-g specially for "goto" commands.
> Maybe `M-g n' should be bound to `Info-goto-node'.
> Or like in Dired, bind it to `j'.

Please don't.  The current binding of `g' in Info was there since day
one, and is also supported by the stand-alone Info reader.  Any
veteran user of Info will have it wired into their finger memory.
Please don't remap it to anything else.

(I agree that there should be a way to revert-buffer in Info node.)

RE: Refreshing Info nodes

[Drew Adams]

> > Maybe `M-g n' should be bound to `Info-goto-node'.
> > Or like in Dired, bind it to `j'.
> 
> Please don't.  The current binding of `g' in Info was there since day
> one, and is also supported by the stand-alone Info reader.  Any
> veteran user of Info will have it wired into their finger memory.
> Please don't remap it to anything else.
> 
> (I agree that there should be a way to revert-buffer in Info node.)

+1

Re: Refreshing Info nodes

[Juri Linkov]

> I think  back(last)/up/g/j should be consistent in at least these modes:
>
> "help" buffer
> dired
> info
> w3m

          back(last)     up     goto     revert
dired     q              ^      j        g
info      l              u      g        -
help      C-c C-b        ?      ?        -

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Wojciech Meyer]

Juri Linkov <juri@jurta.org> writes:

>> I think  back(last)/up/g/j should be consistent in at least these modes:
>>
>> "help" buffer
>> dired
>> info
>> w3m
>
>           back(last)     up     goto     revert
> dired     q              ^      j        g
> info      l              u      g        -
> help      C-c C-b        ?      ?        -

Yes, I found those inconsistencies too.  Info node could be crossed out
from the list of candidates to change as bare info uses traditional
keymap (like Eli mentioned), however the package could provide a
different alternative set of bindings compatible with the rest of Emacs
(I agree that none of Emacs packages uses that approach, usually there
is one keymap, and it is up to the user to rebind it, but in this case
we would enforce at least optional consistency with other packages, and
for me it would be OK to change the default mode to the `right way to do
it in Emacs'. it is a good compromise). However in case of dired, help,
vc and any other mode for navigation over some *hierarchical* entity
that should be *synchronised* with some external state (the most common
is file-system -> dired), this should be unified. (one base mode for it?
I've noticed that we can inherit major modes).

BTW: I found that vc-status could be pretty much similar to dired. Would
that be feasible to annotate files in dired and shift some functionality
from vc-status mode to dired? (Most of the time I spent in dired anyway,
and calling vs status, or having a feedback about status of files under
version control could be good. (I know again, dired uses ls -l format
for historicial reasons, and there will be maybe a good lag during
updating the buffer, but...)

Just mine two cents,

Thanks.  
Wojciech

Re: Refreshing Info nodes

[Stefan Monnier]

>> back(last)     up     goto     revert
>> dired     q              ^      j        g
>> info      l              u      g        -
>> help      C-c C-b        ?      ?        -

Help uses "g" for `View-goto-line' but should switch it to
`revert-buffer' (after getting it to work, obviously).
Note that dired's `q' is not just a different key but it also behaves
differently since it doesn't work *within* a buffer, but jumps to some
earlier one instead.

> is file-system -> dired), this should be unified. (one base mode for it?
> I've noticed that we can inherit major modes).

The closest parent we have for such uses is `special-mode' which does
not account for the "hierarchical" part, nor for the "goto".  I.e. it is
only meant to unify the revert-buffer binding ("g") as well as the
quit-window binding ("q").
Currently special-mode is under used, so patches to use it in more
places are very welcome.

> BTW: I found that vc-status could be pretty much similar to dired. Would
> that be feasible to annotate files in dired and shift some functionality
> from vc-status mode to dired? (Most of the time I spent in dired anyway,
> and calling vs status, or having a feedback about status of files under
> version control could be good.

In my experience with pcl-cvs and vc-dired (tainted by the fact that
vc-dired was painfully slow), dired already uses up a lot of horizontal
space and a lot of key-bindings, so adding VC to it is problematic.
Furthermore, while adding VC status to files in Dired might be good
enough for small projects, for large projects it usually suffers from
the fact that you need to have an overview of all the files you have
modified, which are often scattered among a few directories, which is
why vc-dir doesn't list all the files, but only the "interesting ones".


        Stefan

Re: Refreshing Info nodes

[Juri Linkov]

> I'd rather check something more directly and explicitly related to
> reverting that just (derived-mode-p 'Info-mode).  Ideally there should
> be no check: the code that does the pop-to-buffer should simply not be
> used at all when reverting, instead the non-reverting case should create
> a *info* buffer, setup the few needed vars and then trigger
> `revert-buffer' to do the actual work.

Reverting in Info is implemented by the function `Info-revert-find-node'
whose purpose is to go to an Info node (like `Info-find-node'),
by killing the original buffer and creating a new one.

This is peculiar, but I'd like to avoid reimplementing this mechanism to
keep the traditional behavior, and simply fix a bug to allow it to work
with buffer names other than the default "*info*":

=== modified file 'lisp/info.el'
--- lisp/info.el	2010-06-10 16:42:56 +0000
+++ lisp/info.el	2010-06-16 20:27:42 +0000
@@ -803,9 +803,10 @@ (defun Info-revert-find-node (filename n
   "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
 When *info* is already displaying FILENAME and NODENAME, the window position
 is preserved, if possible."
-  (pop-to-buffer "*info*")
+  (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
   (let ((old-filename Info-current-file)
 	(old-nodename Info-current-node)
+	(old-buffer-name (buffer-name))
 	(pcolumn      (current-column))
 	(pline        (count-lines (point-min) (line-beginning-position)))
 	(wline        (count-lines (point-min) (window-start)))
@@ -813,6 +814,8 @@ (defun Info-revert-find-node (filename n
 	(new-history  (and Info-current-file
 			   (list Info-current-file Info-current-node (point)))))
     (kill-buffer (current-buffer))
+    (pop-to-buffer (or old-buffer-name "*info*"))
+    (Info-mode)
     (Info-find-node filename nodename)
     (setq Info-history old-history)
     (if (and (equal old-filename Info-current-file)

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Juri Linkov]

>>> I think it should work also in variable help buffers, etc.
>> `revert-buffer-function' is not implemented for Help buffers at all.
>
> Indeed and that's a bug.

This patch fixes it:

=== modified file 'lisp/help-mode.el'
--- lisp/help-mode.el	2010-05-20 23:54:55 +0000
+++ lisp/help-mode.el	2010-06-16 20:34:05 +0000
@@ -271,6 +272,8 @@ (defun help-mode ()
 	  ;; also removes BUFFER from the selected window.
 	  (with-current-buffer buffer
 	    (bury-buffer))))
+  (set (make-local-variable 'revert-buffer-function)
+       'help-mode-revert-buffer)
 
   (run-mode-hooks 'help-mode-hook))
 
@@ -783,6 +786,15 @@ (defun help-follow-symbol (&optional pos
 	      (fboundp sym) (facep sym))
       (help-do-xref pos #'help-xref-interned (list sym)))))
 
+(defun help-mode-revert-buffer (ignore-auto noconfirm)
+  (when (or noconfirm (yes-or-no-p "Revert help buffer? "))
+    (let ((pos (point))
+	  (item help-xref-stack-item)
+	  ;; Pretend there is no current item to add to the history.
+	  (help-xref-stack-item nil))
+      (apply (car item) (cdr item))
+      (goto-char pos))))
+
 (defun help-insert-string (string)
   "Insert STRING to the help buffer and install xref info for it.
 This function can be used to restore the old contents of the help buffer

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Juri Linkov]

> Help uses "g" for `View-goto-line' but should switch it to
> `revert-buffer' (after getting it to work, obviously).

I see no way to override View-mode's key binding in Help-mode.

  (define-key help-mode-map "g" 'revert-buffer)

doesn't help, `g' still calls `View-goto-line'.

> In my experience with pcl-cvs and vc-dired (tainted by the fact that
> vc-dired was painfully slow), dired already uses up a lot of horizontal
> space and a lot of key-bindings, so adding VC to it is problematic.
> Furthermore, while adding VC status to files in Dired might be good
> enough for small projects, for large projects it usually suffers from
> the fact that you need to have an overview of all the files you have
> modified, which are often scattered among a few directories, which is
> why vc-dir doesn't list all the files, but only the "interesting ones".

Better than making pcl-cvs and vc-dired compatible with dired,
would be make them compatible with each other.  Sometimes
I type a pcl-cvs key in vc-dired and get a disastrous result,
e.g. instead of hiding committed files (`cvs-mode-ignore')
typing `I' in vc-dired registers the file under point.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Stefan Monnier]

>> vc-dired was painfully slow), dired already uses up a lot of horizontal
>> space and a lot of key-bindings, so adding VC to it is problematic.
[...]
> Better than making pcl-cvs and vc-dired compatible with dired,
> would be make them compatible with each other.  Sometimes

vc-dired doesn't exist any more.


        Stefan

Re: Refreshing Info nodes

[Stefan Monnier]

> === modified file 'lisp/help-mode.el'
> --- lisp/help-mode.el	2010-05-20 23:54:55 +0000
> +++ lisp/help-mode.el	2010-06-16 20:34:05 +0000
> @@ -271,6 +272,8 @@ (defun help-mode ()
>  	  ;; also removes BUFFER from the selected window.
>  	  (with-current-buffer buffer
>  	    (bury-buffer))))
> +  (set (make-local-variable 'revert-buffer-function)
> +       'help-mode-revert-buffer)
 
>    (run-mode-hooks 'help-mode-hook))
 
> @@ -783,6 +786,15 @@ (defun help-follow-symbol (&optional pos
>  	      (fboundp sym) (facep sym))
>        (help-do-xref pos #'help-xref-interned (list sym)))))
 
> +(defun help-mode-revert-buffer (ignore-auto noconfirm)
> +  (when (or noconfirm (yes-or-no-p "Revert help buffer? "))
> +    (let ((pos (point))
> +	  (item help-xref-stack-item)
> +	  ;; Pretend there is no current item to add to the history.
> +	  (help-xref-stack-item nil))
> +      (apply (car item) (cdr item))
> +      (goto-char pos))))
> +
>  (defun help-insert-string (string)
>    "Insert STRING to the help buffer and install xref info for it.
>  This function can be used to restore the old contents of the help buffer

Looks good, thanks.  Tho I think you'll need to bind help-xref-following
to make sure that in a *Help*<2> buffer you don't end up "reverting"
into a new *Help* buffer.


        Stefan

Re: Refreshing Info nodes

[Stefan Monnier]

> Reverting in Info is implemented by the function `Info-revert-find-node'
> whose purpose is to go to an Info node (like `Info-find-node'),
> by killing the original buffer and creating a new one.

> This is peculiar, but I'd like to avoid reimplementing this mechanism to
> keep the traditional behavior, and simply fix a bug to allow it to work
> with buffer names other than the default "*info*":

OTOH I'd really like to see this part of the code modified, because
I think it would clean it up.


        Stefan

Re: Refreshing Info nodes

[Richard Stallman]

Which info nodes would you sayo are the most refreshing?

;-).

Re: Refreshing Info nodes

[Juri Linkov]

>>> vc-dired was painfully slow), dired already uses up a lot of horizontal
>>> space and a lot of key-bindings, so adding VC to it is problematic.
> [...]
>> Better than making pcl-cvs and vc-dired compatible with dired,
>> would be make them compatible with each other.  Sometimes
>
> vc-dired doesn't exist any more.

Oops, sorry, I meant vc-dir.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Wojciech Meyer]

On Thu, Jun 17, 2010 at 9:00 AM, Richard Stallman <rms@gnu.org> wrote:
> Which info nodes would you sayo are the most refreshing?
>
> ;-).
>

Eshell info node I found the most refreshing these days :)

I worked a little bit on this, because i think it is important for us
to have a decent shell in Emacs, currently it works good but the
documentation is not complete. The other reason is that I want to know
about Eshell more.

Re: Refreshing Info nodes

[Juri Linkov]

>> Reverting in Info is implemented by the function `Info-revert-find-node'
>> whose purpose is to go to an Info node (like `Info-find-node'),
>> by killing the original buffer and creating a new one.
>
>> This is peculiar, but I'd like to avoid reimplementing this mechanism to
>> keep the traditional behavior, and simply fix a bug to allow it to work
>> with buffer names other than the default "*info*":
>
> OTOH I'd really like to see this part of the code modified, because
> I think it would clean it up.

`Info-revert-find-node' might be used already by some users as
a standalone function.  Maybe we should write a new function.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Re: Refreshing Info nodes

[Wojciech Meyer]

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Currently special-mode is under used, so patches to use it in more
> places are very welcome.

Here is a `bzr bundle' to make use of the `special-mode' in more places.
Modes that were under special treatment:

archive-mode 
bookmark-bmenu-mode 
doc-view-mode 
image-mode 
occur-mode
tar-mode

In `archive-mode' I needed to get rid of optional argument `force',
which was used to avoid somebody switching manually the mode, and since
the symbol's become interactive, there is a danger (accoring to the
comments - corruption). So I just added a help notice, saying that the
user should not call `archive-mode' on her own.

For the similar reasons I've left alone `dired-mode' and friends, as
this takes arguments. (which are used).

I didn't touch `ibuffer-mode' as this assert explicitly that the mode
should not be derived (not sure why!), due too:
`ibuffer-assert-ibuffer-mode' called from several places, and breaks
`ibuffer' badly.

These are not all the places were we should consider inheriting from
special mode, possibly many other places where we could replace `defun'
with `define-derived-mode'. Also I've noticed some incosistency across
key-bindings, or duplications.

Cheers;
Wojciech


[-- Attachment #2: define-derived-mode-special.txt --]
[-- Type: text/plain, Size: 19389 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: wojciech.meyer@gmail.com-20100828202929-\
#   roh7mjkfjei6fjc5
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk
# testament_sha1: d2ad07a420042e9eccdc83278214b3fd852d27ae
# timestamp: 2010-08-28 21:36:02 +0100
# source_branch: ../define-derived-mode/
# base_revision_id: eliz@gnu.org-20100828081013-yktp2zr7iafsxjtk
# 
# Begin patch
=== modified file 'lisp/arc-mode.el'
--- lisp/arc-mode.el	2010-07-10 18:52:53 +0000
+++ lisp/arc-mode.el	2010-08-28 17:47:11 +0000
@@ -341,7 +341,6 @@
 (defvar archive-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'archive-next-line)
     (define-key map "a" 'archive-alternate-display)
     ;;(define-key map "c" 'archive-copy)
     (define-key map "d" 'archive-flag-deleted)
@@ -349,15 +348,12 @@
     (define-key map "e" 'archive-extract)
     (define-key map "f" 'archive-extract)
     (define-key map "\C-m" 'archive-extract)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "h" 'describe-mode)
     (define-key map "m" 'archive-mark)
     (define-key map "n" 'archive-next-line)
     (define-key map "\C-n" 'archive-next-line)
     (define-key map [down] 'archive-next-line)
     (define-key map "o" 'archive-extract-other-window)
     (define-key map "p" 'archive-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\C-p" 'archive-previous-line)
     (define-key map [up] 'archive-previous-line)
     (define-key map "r" 'archive-rename-entry)
@@ -636,7 +632,7 @@
 ;;; Section: the mode definition
 
 ;;;###autoload
-(defun archive-mode (&optional force)
+(define-derived-mode archive-mode special-mode "Archive mode"
   "Major mode for viewing an archive file in a dired-like way.
 You can move around using the usual cursor motion commands.
 Letters no longer insert themselves.
@@ -647,13 +643,17 @@
 save it, the contents of that buffer will be saved back into the
 archive.
 
+This mode should be used non-interactively only.
+
 \\{archive-mode-map}"
   ;; This is not interactive because you shouldn't be turning this
   ;; mode on and off.  You can corrupt things that way.
+  ;;
+  ;; Now it's derived mode, so therefore it is interactive.
   (if (zerop (buffer-size))
       ;; At present we cannot create archives from scratch
       (funcall (or (default-value 'major-mode) 'fundamental-mode))
-    (if (and (not force) archive-files) nil
+    (if archive-files nil
       (let* ((type (archive-find-type))
 	     (typename (capitalize (symbol-name type))))
 	(kill-all-local-variables)
@@ -698,7 +698,6 @@
 		      (string-match file-name-invalid-regexp
 				    (buffer-file-name)))))
 
-	(setq major-mode 'archive-mode)
 	(setq mode-name (concat typename "-Archive"))
 	;; Run archive-foo-mode-hook and archive-mode-hook
 	(run-mode-hooks (archive-name "mode-hook") 'archive-mode-hook)
@@ -714,8 +713,7 @@
 		locale-coding-system))
       (if (default-value 'enable-multibyte-characters)
 	  (set-buffer-multibyte 'to))
-      (archive-summarize nil)
-      (setq buffer-read-only t))))
+      (archive-summarize nil))))
 
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)

=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el	2010-07-14 19:09:28 +0000
+++ lisp/bookmark.el	2010-08-28 17:45:38 +0000
@@ -1499,7 +1499,6 @@
 (defvar bookmark-bmenu-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map t)
-    (define-key map "q" 'quit-window)
     (define-key map "v" 'bookmark-bmenu-select)
     (define-key map "w" 'bookmark-bmenu-locate)
     (define-key map "2" 'bookmark-bmenu-2-window)
@@ -1515,11 +1514,9 @@
     (define-key map "\C-d" 'bookmark-bmenu-delete-backwards)
     (define-key map "x" 'bookmark-bmenu-execute-deletions)
     (define-key map "d" 'bookmark-bmenu-delete)
-    (define-key map " " 'next-line)
     (define-key map "n" 'next-line)
     (define-key map "p" 'previous-line)
     (define-key map "\177" 'bookmark-bmenu-backup-unmark)
-    (define-key map "?" 'describe-mode)
     (define-key map "u" 'bookmark-bmenu-unmark)
     (define-key map "m" 'bookmark-bmenu-mark)
     (define-key map "l" 'bookmark-bmenu-load)
@@ -1609,7 +1606,7 @@
 
 
 
-(defun bookmark-bmenu-mode ()
+(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
   "Major mode for editing a list of bookmarks.
 Each line describes one of the bookmarks in Emacs.
 Letters do not insert themselves; instead, they are commands.
@@ -1645,9 +1642,6 @@
   (kill-all-local-variables)
   (use-local-map bookmark-bmenu-mode-map)
   (setq truncate-lines t)
-  (setq buffer-read-only t)
-  (setq major-mode 'bookmark-bmenu-mode)
-  (setq mode-name "Bookmark Menu")
   (run-mode-hooks 'bookmark-bmenu-mode-hook))
 
 

=== modified file 'lisp/doc-view.el'
--- lisp/doc-view.el	2010-07-14 15:57:54 +0000
+++ lisp/doc-view.el	2010-08-28 20:21:22 +0000
@@ -333,7 +333,6 @@
     (define-key map (kbd "C-c C-t")   'doc-view-open-text)
     ;; Reconvert the current document.  Don't just use revert-buffer
     ;; because that resets the scale factor, the page number, ...
-    (define-key map (kbd "g")         'doc-view-revert-buffer)
     (define-key map (kbd "r")         'doc-view-revert-buffer)
     map)
   "Keymap used by `doc-view-mode' when displaying a doc as a set of images.")
@@ -1207,7 +1206,7 @@
     l))
 
 ;;;###autoload
-(defun doc-view-mode ()
+(define-derived-mode doc-view-mode special-mode "Doc"
   "Major mode in DocView buffers.
 
 DocView Mode is an Emacs document viewer.  It displays PDF, PS
@@ -1216,7 +1215,6 @@
 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to
 toggle between displaying the document or editing it as text.
 \\{doc-view-mode-map}"
-  (interactive)
 
   (if (= (point-min) (point-max))
       ;; The doc is empty or doesn't exist at all, so fallback to
@@ -1311,15 +1309,14 @@
     (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
     (set (make-local-variable 'bookmark-make-record-function)
 	 'doc-view-bookmark-make-record)
-    (setq mode-name "DocView"
-	  buffer-read-only t
-	  major-mode 'doc-view-mode)
+    (setq buffer-read-only t)
     (doc-view-initiate-display)
     ;; Switch off view-mode explicitly, because doc-view-mode is the
     ;; canonical view mode for PDF/PS/DVI files.  This could be
     ;; switched on automatically depending on the value of
     ;; `view-read-only'.
     (set (make-local-variable 'view-read-only) nil)
+    (setq revert-buffer-function 'doc-view-revert-buffer)
     (run-mode-hooks 'doc-view-mode-hook)))
 
 ;;;###autoload

=== modified file 'lisp/image-mode.el'
--- lisp/image-mode.el	2010-08-17 21:19:11 +0000
+++ lisp/image-mode.el	2010-08-28 20:21:22 +0000
@@ -314,9 +314,7 @@
 (defvar image-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
-    (define-key map "q"         'quit-window)
     (define-key map "\C-c\C-c" 'image-toggle-display)
-    (define-key map (kbd "SPC")       'image-scroll-up)
     (define-key map (kbd "DEL")       'image-scroll-down)
     (define-key map [remap forward-char] 'image-forward-hscroll)
     (define-key map [remap backward-char] 'image-backward-hscroll)
@@ -346,18 +344,16 @@
 (put 'image-mode 'mode-class 'special)
 
 ;;;###autoload
-(defun image-mode ()
+(define-derived-mode image-mode special-mode "Image"
   "Major mode for image files.
 You can use \\<image-mode-map>\\[image-toggle-display]
 to toggle between display as an image and display as text."
-  (interactive)
   (condition-case err
       (progn
 	(unless (display-images-p)
 	  (error "Display does not support images"))
 
 	(kill-all-local-variables)
-	(setq major-mode 'image-mode)
 
 	(if (not (image-get-display-property))
 	    (progn

=== modified file 'lisp/replace.el'
--- lisp/replace.el	2010-08-08 21:12:29 +0000
+++ lisp/replace.el	2010-08-28 20:21:22 +0000
@@ -766,8 +766,6 @@
     (define-key map "\M-p" 'occur-prev)
     (define-key map "r" 'occur-rename-buffer)
     (define-key map "c" 'clone-buffer)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "q" 'quit-window)
     (define-key map "z" 'kill-this-buffer)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
     (define-key map [menu-bar] (make-sparse-keymap))
@@ -834,18 +832,15 @@
   :group 'matching)
 
 (put 'occur-mode 'mode-class 'special)
-(defun occur-mode ()
+(define-derived-mode occur-mode special-mode "Occur"
   "Major mode for output from \\[occur].
 \\<occur-mode-map>Move point to one of the items in this buffer, then use
 \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
 Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
 
 \\{occur-mode-map}"
-  (interactive)
   (kill-all-local-variables)
   (use-local-map occur-mode-map)
-  (setq major-mode 'occur-mode)
-  (setq mode-name "Occur")
   (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
   (make-local-variable 'occur-revert-arguments)
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)

=== modified file 'lisp/tar-mode.el'
--- lisp/tar-mode.el	2010-05-03 02:29:46 +0000
+++ lisp/tar-mode.el	2010-08-28 17:55:47 +0000
@@ -524,7 +524,6 @@
 (defvar tar-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'tar-next-line)
     (define-key map "C" 'tar-copy)
     (define-key map "d" 'tar-flag-deleted)
     (define-key map "\^D" 'tar-flag-deleted)
@@ -532,14 +531,12 @@
     (define-key map "f" 'tar-extract)
     (define-key map "\C-m" 'tar-extract)
     (define-key map [mouse-2] 'tar-mouse-extract)
-    (define-key map "g" 'revert-buffer)
     (define-key map "h" 'describe-mode)
     (define-key map "n" 'tar-next-line)
     (define-key map "\^N" 'tar-next-line)
     (define-key map [down] 'tar-next-line)
     (define-key map "o" 'tar-extract-other-window)
     (define-key map "p" 'tar-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\^P" 'tar-previous-line)
     (define-key map [up] 'tar-previous-line)
     (define-key map "R" 'tar-rename-entry)
@@ -615,7 +612,7 @@
   (if (buffer-live-p tar-data-buffer) (kill-buffer tar-data-buffer)))
 
 ;;;###autoload
-(define-derived-mode tar-mode nil "Tar"
+(define-derived-mode tar-mode special-mode "Tar"
   "Major mode for viewing a tar file as a dired-like listing of its contents.
 You can move around using the usual cursor motion commands.
 Letters no longer insert themselves.

# Begin bundle
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
7kinChIUPk1wgA==

Re: Refreshing Info nodes

[Eli Zaretskii]

> From: Wojciech Meyer <wojciech.meyer@googlemail.com>
> Date: Sat, 28 Aug 2010 21:38:29 +0100
> Cc: Juri Linkov <juri@jurta.org>, Deniz Dogan <deniz.a.m.dogan@gmail.com>,
> 	Wojciech Meyer <wojciech.meyer@googlemail.com>, joakim@verona.se,
> 	emacs-devel@gnu.org
> 
> Here is a `bzr bundle' to make use of the `special-mode' in more places.

Thanks.

> In `archive-mode' I needed to get rid of optional argument `force',
> which was used to avoid somebody switching manually the mode

That "somebody" is archive-maybe-update, which calls archive-mode
with the `force' argument non-nil.  I don't see any changes in
archive-maybe-update to adjust for the loss of this feature.

Re: Refreshing Info nodes

[Wojciech Meyer]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> In `archive-mode' I needed to get rid of optional argument `force',
>> which was used to avoid somebody switching manually the mode
>
> That "somebody" is archive-maybe-update, which calls archive-mode
> with the `force' argument non-nil.  I don't see any changes in
> archive-maybe-update to adjust for the loss of this feature.

Yes, sorry, my fault to not check it (as i did for dired)!

Correct patch attached.

Cheers;

Wojciech


[-- Attachment #2: define-derived-mode-special.txt --]
[-- Type: text/plain, Size: 21557 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: wojciech.meyer@gmail.com-20100828220854-\
#   574a373p263zx55o
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk
# testament_sha1: c7e126cfa572c47e18255bd7e35af3140c5be6f4
# timestamp: 2010-08-28 23:09:18 +0100
# source_branch: ../define-derived-mode/
# base_revision_id: eliz@gnu.org-20100828081013-yktp2zr7iafsxjtk
# 
# Begin patch
=== modified file 'lisp/arc-mode.el'
--- lisp/arc-mode.el	2010-07-10 18:52:53 +0000
+++ lisp/arc-mode.el	2010-08-28 22:08:54 +0000
@@ -341,7 +341,6 @@
 (defvar archive-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'archive-next-line)
     (define-key map "a" 'archive-alternate-display)
     ;;(define-key map "c" 'archive-copy)
     (define-key map "d" 'archive-flag-deleted)
@@ -349,15 +348,12 @@
     (define-key map "e" 'archive-extract)
     (define-key map "f" 'archive-extract)
     (define-key map "\C-m" 'archive-extract)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "h" 'describe-mode)
     (define-key map "m" 'archive-mark)
     (define-key map "n" 'archive-next-line)
     (define-key map "\C-n" 'archive-next-line)
     (define-key map [down] 'archive-next-line)
     (define-key map "o" 'archive-extract-other-window)
     (define-key map "p" 'archive-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\C-p" 'archive-previous-line)
     (define-key map [up] 'archive-previous-line)
     (define-key map "r" 'archive-rename-entry)
@@ -632,24 +628,10 @@
 		(error "Entry is not a regular member of the archive"))))
       (if (not noerror)
           (error "Line does not describe a member of the archive")))))
-;; -------------------------------------------------------------------------
-;;; Section: the mode definition
-
-;;;###autoload
-(defun archive-mode (&optional force)
-  "Major mode for viewing an archive file in a dired-like way.
-You can move around using the usual cursor motion commands.
-Letters no longer insert themselves.
-Type `e' to pull a file out of the archive and into its own buffer;
-or click mouse-2 on the file's line in the archive mode buffer.
-
-If you edit a sub-file of this archive (as with the `e' command) and
-save it, the contents of that buffer will be saved back into the
-archive.
-
-\\{archive-mode-map}"
-  ;; This is not interactive because you shouldn't be turning this
-  ;; mode on and off.  You can corrupt things that way.
+
+(defun archive-setup-mode (&optional force)
+  "Wrap all the mode setup code into separate function callable from 
+the package code."
   (if (zerop (buffer-size))
       ;; At present we cannot create archives from scratch
       (funcall (or (default-value 'major-mode) 'fundamental-mode))
@@ -717,6 +699,30 @@
       (archive-summarize nil)
       (setq buffer-read-only t))))
 
+;; -------------------------------------------------------------------------
+;;; Section: the mode definition
+
+;;;###autoload
+(define-derived-mode archive-mode special-mode "Archive mode"
+  "Major mode for viewing an archive file in a dired-like way.
+You can move around using the usual cursor motion commands.
+Letters no longer insert themselves.
+Type `e' to pull a file out of the archive and into its own buffer;
+or click mouse-2 on the file's line in the archive mode buffer.
+
+If you edit a sub-file of this archive (as with the `e' command) and
+save it, the contents of that buffer will be saved back into the
+archive.
+
+\\{archive-mode-map}"
+  ;; This is not interactive because you shouldn't be turning this
+  ;; mode on and off.  You can corrupt things that way.
+  ;;
+  ;; Now it's derived mode, so therefore it is interactive.
+  ;;
+  (archive-setup-mode))
+  
+
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)
 
@@ -888,7 +894,7 @@
 	  (setq archive-files nil)
 	  (erase-buffer)
 	  (insert-file-contents name)
-	  (archive-mode t)
+	  (archive-setup-mode t)
 	  (goto-char archive-file-list-start)
 	  (archive-next-line lno))
 	(archive-delete-local name)
@@ -1396,7 +1402,7 @@
     (let ((revert-buffer-function nil)
 	  (coding-system-for-read 'no-conversion))
       (revert-buffer t t))
-    (archive-mode)
+    (archive-setup-mode)
     (goto-char archive-file-list-start)
     (archive-next-line no)))
 

=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el	2010-07-14 19:09:28 +0000
+++ lisp/bookmark.el	2010-08-28 17:45:38 +0000
@@ -1499,7 +1499,6 @@
 (defvar bookmark-bmenu-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map t)
-    (define-key map "q" 'quit-window)
     (define-key map "v" 'bookmark-bmenu-select)
     (define-key map "w" 'bookmark-bmenu-locate)
     (define-key map "2" 'bookmark-bmenu-2-window)
@@ -1515,11 +1514,9 @@
     (define-key map "\C-d" 'bookmark-bmenu-delete-backwards)
     (define-key map "x" 'bookmark-bmenu-execute-deletions)
     (define-key map "d" 'bookmark-bmenu-delete)
-    (define-key map " " 'next-line)
     (define-key map "n" 'next-line)
     (define-key map "p" 'previous-line)
     (define-key map "\177" 'bookmark-bmenu-backup-unmark)
-    (define-key map "?" 'describe-mode)
     (define-key map "u" 'bookmark-bmenu-unmark)
     (define-key map "m" 'bookmark-bmenu-mark)
     (define-key map "l" 'bookmark-bmenu-load)
@@ -1609,7 +1606,7 @@
 
 
 
-(defun bookmark-bmenu-mode ()
+(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
   "Major mode for editing a list of bookmarks.
 Each line describes one of the bookmarks in Emacs.
 Letters do not insert themselves; instead, they are commands.
@@ -1645,9 +1642,6 @@
   (kill-all-local-variables)
   (use-local-map bookmark-bmenu-mode-map)
   (setq truncate-lines t)
-  (setq buffer-read-only t)
-  (setq major-mode 'bookmark-bmenu-mode)
-  (setq mode-name "Bookmark Menu")
   (run-mode-hooks 'bookmark-bmenu-mode-hook))
 
 

=== modified file 'lisp/doc-view.el'
--- lisp/doc-view.el	2010-07-14 15:57:54 +0000
+++ lisp/doc-view.el	2010-08-28 20:21:22 +0000
@@ -333,7 +333,6 @@
     (define-key map (kbd "C-c C-t")   'doc-view-open-text)
     ;; Reconvert the current document.  Don't just use revert-buffer
     ;; because that resets the scale factor, the page number, ...
-    (define-key map (kbd "g")         'doc-view-revert-buffer)
     (define-key map (kbd "r")         'doc-view-revert-buffer)
     map)
   "Keymap used by `doc-view-mode' when displaying a doc as a set of images.")
@@ -1207,7 +1206,7 @@
     l))
 
 ;;;###autoload
-(defun doc-view-mode ()
+(define-derived-mode doc-view-mode special-mode "Doc"
   "Major mode in DocView buffers.
 
 DocView Mode is an Emacs document viewer.  It displays PDF, PS
@@ -1216,7 +1215,6 @@
 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to
 toggle between displaying the document or editing it as text.
 \\{doc-view-mode-map}"
-  (interactive)
 
   (if (= (point-min) (point-max))
       ;; The doc is empty or doesn't exist at all, so fallback to
@@ -1311,15 +1309,14 @@
     (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
     (set (make-local-variable 'bookmark-make-record-function)
 	 'doc-view-bookmark-make-record)
-    (setq mode-name "DocView"
-	  buffer-read-only t
-	  major-mode 'doc-view-mode)
+    (setq buffer-read-only t)
     (doc-view-initiate-display)
     ;; Switch off view-mode explicitly, because doc-view-mode is the
     ;; canonical view mode for PDF/PS/DVI files.  This could be
     ;; switched on automatically depending on the value of
     ;; `view-read-only'.
     (set (make-local-variable 'view-read-only) nil)
+    (setq revert-buffer-function 'doc-view-revert-buffer)
     (run-mode-hooks 'doc-view-mode-hook)))
 
 ;;;###autoload

=== modified file 'lisp/image-mode.el'
--- lisp/image-mode.el	2010-08-17 21:19:11 +0000
+++ lisp/image-mode.el	2010-08-28 20:21:22 +0000
@@ -314,9 +314,7 @@
 (defvar image-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
-    (define-key map "q"         'quit-window)
     (define-key map "\C-c\C-c" 'image-toggle-display)
-    (define-key map (kbd "SPC")       'image-scroll-up)
     (define-key map (kbd "DEL")       'image-scroll-down)
     (define-key map [remap forward-char] 'image-forward-hscroll)
     (define-key map [remap backward-char] 'image-backward-hscroll)
@@ -346,18 +344,16 @@
 (put 'image-mode 'mode-class 'special)
 
 ;;;###autoload
-(defun image-mode ()
+(define-derived-mode image-mode special-mode "Image"
   "Major mode for image files.
 You can use \\<image-mode-map>\\[image-toggle-display]
 to toggle between display as an image and display as text."
-  (interactive)
   (condition-case err
       (progn
 	(unless (display-images-p)
 	  (error "Display does not support images"))
 
 	(kill-all-local-variables)
-	(setq major-mode 'image-mode)
 
 	(if (not (image-get-display-property))
 	    (progn

=== modified file 'lisp/replace.el'
--- lisp/replace.el	2010-08-08 21:12:29 +0000
+++ lisp/replace.el	2010-08-28 20:21:22 +0000
@@ -766,8 +766,6 @@
     (define-key map "\M-p" 'occur-prev)
     (define-key map "r" 'occur-rename-buffer)
     (define-key map "c" 'clone-buffer)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "q" 'quit-window)
     (define-key map "z" 'kill-this-buffer)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
     (define-key map [menu-bar] (make-sparse-keymap))
@@ -834,18 +832,15 @@
   :group 'matching)
 
 (put 'occur-mode 'mode-class 'special)
-(defun occur-mode ()
+(define-derived-mode occur-mode special-mode "Occur"
   "Major mode for output from \\[occur].
 \\<occur-mode-map>Move point to one of the items in this buffer, then use
 \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
 Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
 
 \\{occur-mode-map}"
-  (interactive)
   (kill-all-local-variables)
   (use-local-map occur-mode-map)
-  (setq major-mode 'occur-mode)
-  (setq mode-name "Occur")
   (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
   (make-local-variable 'occur-revert-arguments)
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)

=== modified file 'lisp/tar-mode.el'
--- lisp/tar-mode.el	2010-05-03 02:29:46 +0000
+++ lisp/tar-mode.el	2010-08-28 17:55:47 +0000
@@ -524,7 +524,6 @@
 (defvar tar-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'tar-next-line)
     (define-key map "C" 'tar-copy)
     (define-key map "d" 'tar-flag-deleted)
     (define-key map "\^D" 'tar-flag-deleted)
@@ -532,14 +531,12 @@
     (define-key map "f" 'tar-extract)
     (define-key map "\C-m" 'tar-extract)
     (define-key map [mouse-2] 'tar-mouse-extract)
-    (define-key map "g" 'revert-buffer)
     (define-key map "h" 'describe-mode)
     (define-key map "n" 'tar-next-line)
     (define-key map "\^N" 'tar-next-line)
     (define-key map [down] 'tar-next-line)
     (define-key map "o" 'tar-extract-other-window)
     (define-key map "p" 'tar-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\^P" 'tar-previous-line)
     (define-key map [up] 'tar-previous-line)
     (define-key map "R" 'tar-rename-entry)
@@ -615,7 +612,7 @@
   (if (buffer-live-p tar-data-buffer) (kill-buffer tar-data-buffer)))
 
 ;;;###autoload
-(define-derived-mode tar-mode nil "Tar"
+(define-derived-mode tar-mode special-mode "Tar"
   "Major mode for viewing a tar file as a dired-like listing of its contents.
 You can move around using the usual cursor motion commands.
 Letters no longer insert themselves.

# Begin bundle
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

Re: Refreshing Info nodes

[Wojciech Meyer]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

> Correct patch attached.

Now there was some problem with buffer local variable
`revert-buffer-function'. (in doc-view-mode) I corrected it I believe,
and this is the final version of patch.  Could anybody review that once
more, please?

Thanks,
Wojciech

[-- Attachment #2: define-derived-mode-special-FINAL.txt --]
[-- Type: text/plain, Size: 21895 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: wojciech.meyer@gmail.com-20100829150839-\
#   946nk06x5bq8glq3
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk
# testament_sha1: ae60fb4dc86c7121984c9f2cbb1b030c3bb2cd8f
# timestamp: 2010-08-29 16:09:19 +0100
# source_branch: ../define-derived-mode/
# base_revision_id: eliz@gnu.org-20100828081013-yktp2zr7iafsxjtk
# 
# Begin patch
=== modified file 'lisp/arc-mode.el'
--- lisp/arc-mode.el	2010-07-10 18:52:53 +0000
+++ lisp/arc-mode.el	2010-08-28 22:08:54 +0000
@@ -341,7 +341,6 @@
 (defvar archive-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'archive-next-line)
     (define-key map "a" 'archive-alternate-display)
     ;;(define-key map "c" 'archive-copy)
     (define-key map "d" 'archive-flag-deleted)
@@ -349,15 +348,12 @@
     (define-key map "e" 'archive-extract)
     (define-key map "f" 'archive-extract)
     (define-key map "\C-m" 'archive-extract)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "h" 'describe-mode)
     (define-key map "m" 'archive-mark)
     (define-key map "n" 'archive-next-line)
     (define-key map "\C-n" 'archive-next-line)
     (define-key map [down] 'archive-next-line)
     (define-key map "o" 'archive-extract-other-window)
     (define-key map "p" 'archive-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\C-p" 'archive-previous-line)
     (define-key map [up] 'archive-previous-line)
     (define-key map "r" 'archive-rename-entry)
@@ -632,24 +628,10 @@
 		(error "Entry is not a regular member of the archive"))))
       (if (not noerror)
           (error "Line does not describe a member of the archive")))))
-;; -------------------------------------------------------------------------
-;;; Section: the mode definition
-
-;;;###autoload
-(defun archive-mode (&optional force)
-  "Major mode for viewing an archive file in a dired-like way.
-You can move around using the usual cursor motion commands.
-Letters no longer insert themselves.
-Type `e' to pull a file out of the archive and into its own buffer;
-or click mouse-2 on the file's line in the archive mode buffer.
-
-If you edit a sub-file of this archive (as with the `e' command) and
-save it, the contents of that buffer will be saved back into the
-archive.
-
-\\{archive-mode-map}"
-  ;; This is not interactive because you shouldn't be turning this
-  ;; mode on and off.  You can corrupt things that way.
+
+(defun archive-setup-mode (&optional force)
+  "Wrap all the mode setup code into separate function callable from 
+the package code."
   (if (zerop (buffer-size))
       ;; At present we cannot create archives from scratch
       (funcall (or (default-value 'major-mode) 'fundamental-mode))
@@ -717,6 +699,30 @@
       (archive-summarize nil)
       (setq buffer-read-only t))))
 
+;; -------------------------------------------------------------------------
+;;; Section: the mode definition
+
+;;;###autoload
+(define-derived-mode archive-mode special-mode "Archive mode"
+  "Major mode for viewing an archive file in a dired-like way.
+You can move around using the usual cursor motion commands.
+Letters no longer insert themselves.
+Type `e' to pull a file out of the archive and into its own buffer;
+or click mouse-2 on the file's line in the archive mode buffer.
+
+If you edit a sub-file of this archive (as with the `e' command) and
+save it, the contents of that buffer will be saved back into the
+archive.
+
+\\{archive-mode-map}"
+  ;; This is not interactive because you shouldn't be turning this
+  ;; mode on and off.  You can corrupt things that way.
+  ;;
+  ;; Now it's derived mode, so therefore it is interactive.
+  ;;
+  (archive-setup-mode))
+  
+
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)
 
@@ -888,7 +894,7 @@
 	  (setq archive-files nil)
 	  (erase-buffer)
 	  (insert-file-contents name)
-	  (archive-mode t)
+	  (archive-setup-mode t)
 	  (goto-char archive-file-list-start)
 	  (archive-next-line lno))
 	(archive-delete-local name)
@@ -1396,7 +1402,7 @@
     (let ((revert-buffer-function nil)
 	  (coding-system-for-read 'no-conversion))
       (revert-buffer t t))
-    (archive-mode)
+    (archive-setup-mode)
     (goto-char archive-file-list-start)
     (archive-next-line no)))
 

=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el	2010-07-14 19:09:28 +0000
+++ lisp/bookmark.el	2010-08-28 17:45:38 +0000
@@ -1499,7 +1499,6 @@
 (defvar bookmark-bmenu-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map t)
-    (define-key map "q" 'quit-window)
     (define-key map "v" 'bookmark-bmenu-select)
     (define-key map "w" 'bookmark-bmenu-locate)
     (define-key map "2" 'bookmark-bmenu-2-window)
@@ -1515,11 +1514,9 @@
     (define-key map "\C-d" 'bookmark-bmenu-delete-backwards)
     (define-key map "x" 'bookmark-bmenu-execute-deletions)
     (define-key map "d" 'bookmark-bmenu-delete)
-    (define-key map " " 'next-line)
     (define-key map "n" 'next-line)
     (define-key map "p" 'previous-line)
     (define-key map "\177" 'bookmark-bmenu-backup-unmark)
-    (define-key map "?" 'describe-mode)
     (define-key map "u" 'bookmark-bmenu-unmark)
     (define-key map "m" 'bookmark-bmenu-mark)
     (define-key map "l" 'bookmark-bmenu-load)
@@ -1609,7 +1606,7 @@
 
 
 
-(defun bookmark-bmenu-mode ()
+(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
   "Major mode for editing a list of bookmarks.
 Each line describes one of the bookmarks in Emacs.
 Letters do not insert themselves; instead, they are commands.
@@ -1645,9 +1642,6 @@
   (kill-all-local-variables)
   (use-local-map bookmark-bmenu-mode-map)
   (setq truncate-lines t)
-  (setq buffer-read-only t)
-  (setq major-mode 'bookmark-bmenu-mode)
-  (setq mode-name "Bookmark Menu")
   (run-mode-hooks 'bookmark-bmenu-mode-hook))
 
 

=== modified file 'lisp/doc-view.el'
--- lisp/doc-view.el	2010-07-14 15:57:54 +0000
+++ lisp/doc-view.el	2010-08-29 15:08:39 +0000
@@ -333,7 +333,6 @@
     (define-key map (kbd "C-c C-t")   'doc-view-open-text)
     ;; Reconvert the current document.  Don't just use revert-buffer
     ;; because that resets the scale factor, the page number, ...
-    (define-key map (kbd "g")         'doc-view-revert-buffer)
     (define-key map (kbd "r")         'doc-view-revert-buffer)
     map)
   "Keymap used by `doc-view-mode' when displaying a doc as a set of images.")
@@ -1207,7 +1206,7 @@
     l))
 
 ;;;###autoload
-(defun doc-view-mode ()
+(define-derived-mode doc-view-mode special-mode "Doc"
   "Major mode in DocView buffers.
 
 DocView Mode is an Emacs document viewer.  It displays PDF, PS
@@ -1216,7 +1215,6 @@
 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to
 toggle between displaying the document or editing it as text.
 \\{doc-view-mode-map}"
-  (interactive)
 
   (if (= (point-min) (point-max))
       ;; The doc is empty or doesn't exist at all, so fallback to
@@ -1311,15 +1309,14 @@
     (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
     (set (make-local-variable 'bookmark-make-record-function)
 	 'doc-view-bookmark-make-record)
-    (setq mode-name "DocView"
-	  buffer-read-only t
-	  major-mode 'doc-view-mode)
+    (setq buffer-read-only t)
     (doc-view-initiate-display)
     ;; Switch off view-mode explicitly, because doc-view-mode is the
     ;; canonical view mode for PDF/PS/DVI files.  This could be
     ;; switched on automatically depending on the value of
     ;; `view-read-only'.
     (set (make-local-variable 'view-read-only) nil)
+    (set (make-local-variable 'revert-buffer-function) 'doc-view-revert-buffer)
     (run-mode-hooks 'doc-view-mode-hook)))
 
 ;;;###autoload

=== modified file 'lisp/image-mode.el'
--- lisp/image-mode.el	2010-08-17 21:19:11 +0000
+++ lisp/image-mode.el	2010-08-28 20:21:22 +0000
@@ -314,9 +314,7 @@
 (defvar image-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
-    (define-key map "q"         'quit-window)
     (define-key map "\C-c\C-c" 'image-toggle-display)
-    (define-key map (kbd "SPC")       'image-scroll-up)
     (define-key map (kbd "DEL")       'image-scroll-down)
     (define-key map [remap forward-char] 'image-forward-hscroll)
     (define-key map [remap backward-char] 'image-backward-hscroll)
@@ -346,18 +344,16 @@
 (put 'image-mode 'mode-class 'special)
 
 ;;;###autoload
-(defun image-mode ()
+(define-derived-mode image-mode special-mode "Image"
   "Major mode for image files.
 You can use \\<image-mode-map>\\[image-toggle-display]
 to toggle between display as an image and display as text."
-  (interactive)
   (condition-case err
       (progn
 	(unless (display-images-p)
 	  (error "Display does not support images"))
 
 	(kill-all-local-variables)
-	(setq major-mode 'image-mode)
 
 	(if (not (image-get-display-property))
 	    (progn

=== modified file 'lisp/replace.el'
--- lisp/replace.el	2010-08-08 21:12:29 +0000
+++ lisp/replace.el	2010-08-28 20:21:22 +0000
@@ -766,8 +766,6 @@
     (define-key map "\M-p" 'occur-prev)
     (define-key map "r" 'occur-rename-buffer)
     (define-key map "c" 'clone-buffer)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "q" 'quit-window)
     (define-key map "z" 'kill-this-buffer)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
     (define-key map [menu-bar] (make-sparse-keymap))
@@ -834,18 +832,15 @@
   :group 'matching)
 
 (put 'occur-mode 'mode-class 'special)
-(defun occur-mode ()
+(define-derived-mode occur-mode special-mode "Occur"
   "Major mode for output from \\[occur].
 \\<occur-mode-map>Move point to one of the items in this buffer, then use
 \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
 Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
 
 \\{occur-mode-map}"
-  (interactive)
   (kill-all-local-variables)
   (use-local-map occur-mode-map)
-  (setq major-mode 'occur-mode)
-  (setq mode-name "Occur")
   (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
   (make-local-variable 'occur-revert-arguments)
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)

=== modified file 'lisp/tar-mode.el'
--- lisp/tar-mode.el	2010-05-03 02:29:46 +0000
+++ lisp/tar-mode.el	2010-08-28 17:55:47 +0000
@@ -524,7 +524,6 @@
 (defvar tar-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'tar-next-line)
     (define-key map "C" 'tar-copy)
     (define-key map "d" 'tar-flag-deleted)
     (define-key map "\^D" 'tar-flag-deleted)
@@ -532,14 +531,12 @@
     (define-key map "f" 'tar-extract)
     (define-key map "\C-m" 'tar-extract)
     (define-key map [mouse-2] 'tar-mouse-extract)
-    (define-key map "g" 'revert-buffer)
     (define-key map "h" 'describe-mode)
     (define-key map "n" 'tar-next-line)
     (define-key map "\^N" 'tar-next-line)
     (define-key map [down] 'tar-next-line)
     (define-key map "o" 'tar-extract-other-window)
     (define-key map "p" 'tar-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\^P" 'tar-previous-line)
     (define-key map [up] 'tar-previous-line)
     (define-key map "R" 'tar-rename-entry)
@@ -615,7 +612,7 @@
   (if (buffer-live-p tar-data-buffer) (kill-buffer tar-data-buffer)))
 
 ;;;###autoload
-(define-derived-mode tar-mode nil "Tar"
+(define-derived-mode tar-mode special-mode "Tar"
   "Major mode for viewing a tar file as a dired-like listing of its contents.
 You can move around using the usual cursor motion commands.
 Letters no longer insert themselves.

# Begin bundle
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

Re: Refreshing Info nodes

[Stefan Monnier]

> Now there was some problem with buffer local variable
> `revert-buffer-function'. (in doc-view-mode) I corrected it I believe,
> and this is the final version of patch.  Could anybody review that once
> more, please?

Some nitpicks:

> +  ;; This is not interactive because you shouldn't be turning this
> +  ;; mode on and off.  You can corrupt things that way.
> +  ;;
> +  ;; Now it's derived mode, so therefore it is interactive.

These two pieces are contradictory, please clarify.  BTW, we should
change archive-mode to use buffer-swap-text like we did for tar-mode,
which should address this risk of corruption.

> -(defun bookmark-bmenu-mode ()
> +(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
>    "Major mode for editing a list of bookmarks.
>  Each line describes one of the bookmarks in Emacs.
>  Letters do not insert themselves; instead, they are commands.
> @@ -1645,9 +1642,6 @@
>    (kill-all-local-variables)
>    (use-local-map bookmark-bmenu-mode-map)

Both kill-all-local-variables and use-local-map can be removed (actually
kill-all-local-variables *has* to be removed since it undoes the previous
call to special-mode).

>    (setq truncate-lines t)
> -  (setq buffer-read-only t)
> -  (setq major-mode 'bookmark-bmenu-mode)
> -  (setq mode-name "Bookmark Menu")
>    (run-mode-hooks 'bookmark-bmenu-mode-hook))

Why remove (setq buffer-read-only t) ?
And why not remove the run-mode-hooks?

> === modified file 'lisp/doc-view.el'
> --- lisp/doc-view.el	2010-07-14 15:57:54 +0000
> +++ lisp/doc-view.el	2010-08-29 15:08:39 +0000
> @@ -333,7 +333,6 @@
>      (define-key map (kbd "C-c C-t")   'doc-view-open-text)
>      ;; Reconvert the current document.  Don't just use revert-buffer
>      ;; because that resets the scale factor, the page number, ...
> -    (define-key map (kbd "g")         'doc-view-revert-buffer)

If you remove this line, you need to remove the above comment as well
(after making sure that the problem it mentions don't apply any more).

> +    (set (make-local-variable 'revert-buffer-function) 'doc-view-revert-buffer)
>      (run-mode-hooks 'doc-view-mode-hook)))

Here as well you should remove the run-mode-hooks.

>  ;;;###autoload
> -(defun image-mode ()
> +(define-derived-mode image-mode special-mode "Image"
>    "Major mode for image files.
>  You can use \\<image-mode-map>\\[image-toggle-display]
>  to toggle between display as an image and display as text."
> -  (interactive)
>    (condition-case err
>        (progn
>  	(unless (display-images-p)
>  	  (error "Display does not support images"))
 
>  	(kill-all-local-variables)
> -	(setq major-mode 'image-mode)

IIRC define-derived-mode sets major-mode before running the body of the
macro, so when you call `error' above, `major-mode' and `mode-name' have
already been set and need to be reverted.

> -(defun occur-mode ()
> +(define-derived-mode occur-mode special-mode "Occur"
>    "Major mode for output from \\[occur].
>  \\<occur-mode-map>Move point to one of the items in this buffer, then use
>  \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
>  Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
 
>  \\{occur-mode-map}"
> -  (interactive)
>    (kill-all-local-variables)
>    (use-local-map occur-mode-map)

These last two should disappear as mentioned earlier.


        Stefan

Re: Refreshing Info nodes

[Wojciech Meyer]

Again, thanks a lot for spending time on it. In the meantime I will fix
these problems, and send you back the new one.

Thanks,
Wojciech

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Now there was some problem with buffer local variable
>> `revert-buffer-function'. (in doc-view-mode) I corrected it I believe,
>> and this is the final version of patch.  Could anybody review that once
>> more, please?
>
> Some nitpicks:
>
>> +  ;; This is not interactive because you shouldn't be turning this
>> +  ;; mode on and off.  You can corrupt things that way.
>> +  ;;
>> +  ;; Now it's derived mode, so therefore it is interactive.
>
> These two pieces are contradictory, please clarify.  BTW, we should
> change archive-mode to use buffer-swap-text like we did for tar-mode,
> which should address this risk of corruption.
>
>> -(defun bookmark-bmenu-mode ()
>> +(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
>>    "Major mode for editing a list of bookmarks.
>>  Each line describes one of the bookmarks in Emacs.
>>  Letters do not insert themselves; instead, they are commands.
>> @@ -1645,9 +1642,6 @@
>>    (kill-all-local-variables)
>>    (use-local-map bookmark-bmenu-mode-map)
>
> Both kill-all-local-variables and use-local-map can be removed (actually
> kill-all-local-variables *has* to be removed since it undoes the previous
> call to special-mode).
>
>>    (setq truncate-lines t)
>> -  (setq buffer-read-only t)
>> -  (setq major-mode 'bookmark-bmenu-mode)
>> -  (setq mode-name "Bookmark Menu")
>>    (run-mode-hooks 'bookmark-bmenu-mode-hook))
>
> Why remove (setq buffer-read-only t) ?
> And why not remove the run-mode-hooks?
>
>> === modified file 'lisp/doc-view.el'
>> --- lisp/doc-view.el	2010-07-14 15:57:54 +0000
>> +++ lisp/doc-view.el	2010-08-29 15:08:39 +0000
>> @@ -333,7 +333,6 @@
>>      (define-key map (kbd "C-c C-t")   'doc-view-open-text)
>>      ;; Reconvert the current document.  Don't just use revert-buffer
>>      ;; because that resets the scale factor, the page number, ...
>> -    (define-key map (kbd "g")         'doc-view-revert-buffer)
>
> If you remove this line, you need to remove the above comment as well
> (after making sure that the problem it mentions don't apply any more).
>
>> +    (set (make-local-variable 'revert-buffer-function) 'doc-view-revert-buffer)
>>      (run-mode-hooks 'doc-view-mode-hook)))
>
> Here as well you should remove the run-mode-hooks.
>
>>  ;;;###autoload
>> -(defun image-mode ()
>> +(define-derived-mode image-mode special-mode "Image"
>>    "Major mode for image files.
>>  You can use \\<image-mode-map>\\[image-toggle-display]
>>  to toggle between display as an image and display as text."
>> -  (interactive)
>>    (condition-case err
>>        (progn
>>  	(unless (display-images-p)
>>  	  (error "Display does not support images"))
>  
>>  	(kill-all-local-variables)
>> -	(setq major-mode 'image-mode)
>
> IIRC define-derived-mode sets major-mode before running the body of the
> macro, so when you call `error' above, `major-mode' and `mode-name' have
> already been set and need to be reverted.
>
>> -(defun occur-mode ()
>> +(define-derived-mode occur-mode special-mode "Occur"
>>    "Major mode for output from \\[occur].
>>  \\<occur-mode-map>Move point to one of the items in this buffer, then use
>>  \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
>>  Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
>  
>>  \\{occur-mode-map}"
>> -  (interactive)
>>    (kill-all-local-variables)
>>    (use-local-map occur-mode-map)
>
> These last two should disappear as mentioned earlier.
>
>
>         Stefan

Re: Refreshing Info nodes

[Wojciech Meyer]

[-- Attachment #1: Type: text/plain, Size: 6873 bytes --]


Stefan Monnier <monnier@iro.umontreal.ca> writes:

Thanks for it, below is my update:

>> Now there was some problem with buffer local variable
>> `revert-buffer-function'. (in doc-view-mode) I corrected it I believe,
>> and this is the final version of patch.  Could anybody review that once
>> more, please?
>
> Some nitpicks:
>
>> +  ;; This is not interactive because you shouldn't be turning this
>> +  ;; mode on and off.  You can corrupt things that way.
>> +  ;;
>> +  ;; Now it's derived mode, so therefore it is interactive.
>
> These two pieces are contradictory, please clarify.  BTW, we should
> change archive-mode to use buffer-swap-text like we did for tar-mode,
> which should address this risk of corruption.

Done. I am investigating possibility of using swap-buffer with
archive-mode. This is not done yet, so you might consider not applying
diffs to `arc-mode.el' (however I am planning to fix it ASAP too..)

BTW: Maybe we should think about merging (at least reusing bits & pieces
and making user interface more consistent) tar-mode <-> archive-mode?

>
>> -(defun bookmark-bmenu-mode ()
>> +(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
>>    "Major mode for editing a list of bookmarks.
>>  Each line describes one of the bookmarks in Emacs.
>>  Letters do not insert themselves; instead, they are commands.
>> @@ -1645,9 +1642,6 @@
>>    (kill-all-local-variables)
>>    (use-local-map bookmark-bmenu-mode-map)
>
> Both kill-all-local-variables and use-local-map can be removed (actually
> kill-all-local-variables *has* to be removed since it undoes the previous
> call to special-mode).

Done.

>
>>    (setq truncate-lines t)
>> -  (setq buffer-read-only t)
>> -  (setq major-mode 'bookmark-bmenu-mode)
>> -  (setq mode-name "Bookmark Menu")
>>    (run-mode-hooks 'bookmark-bmenu-mode-hook))
>
> Why remove (setq buffer-read-only t) ?
> And why not remove the run-mode-hooks?

Done.

>
>> === modified file 'lisp/doc-view.el'
>> --- lisp/doc-view.el	2010-07-14 15:57:54 +0000
>> +++ lisp/doc-view.el	2010-08-29 15:08:39 +0000
>> @@ -333,7 +333,6 @@
>>      (define-key map (kbd "C-c C-t")   'doc-view-open-text)
>>      ;; Reconvert the current document.  Don't just use revert-buffer
>>      ;; because that resets the scale factor, the page number, ...
>> -    (define-key map (kbd "g")         'doc-view-revert-buffer)
>
> If you remove this line, you need to remove the above comment as well
> (after making sure that the problem it mentions don't apply any more).
>

Done. However for some reasons I am not able to revert the buffer with
"g" (and not sure why, AFAIK I could do it before, investigating)
That's why I've left "g" as 'revert-buffer.

BTW:
    (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode)
				doc-view-previous-major-mode
			      major-mode)))
      (set (make-local-variable 'doc-view-previous-major-mode)
    prev-major-mode))

Here is code sensitive on previous major mode, please see comments
below.

Also, there is some problem with reverting itself:
it shows error message: `doc-view-revert-buffer: Variable binding depth
exceeds max-specpdl-size'. Did anybody notice something similar? (emacs
-Q, bzr trunk rev 101406).
        

>> +    (set (make-local-variable 'revert-buffer-function) 'doc-view-revert-buffer)
>>      (run-mode-hooks 'doc-view-mode-hook)))
>
> Here as well you should remove the run-mode-hooks.
>
>>  ;;;###autoload
>> -(defun image-mode ()
>> +(define-derived-mode image-mode special-mode "Image"
>>    "Major mode for image files.
>>  You can use \\<image-mode-map>\\[image-toggle-display]
>>  to toggle between display as an image and display as text."
>> -  (interactive)
>>    (condition-case err
>>        (progn
>>  	(unless (display-images-p)
>>  	  (error "Display does not support images"))
>  
>>  	(kill-all-local-variables)
>> -	(setq major-mode 'image-mode)
>
> IIRC define-derived-mode sets major-mode before running the body of the
> macro, so when you call `error' above, `major-mode' and `mode-name' have
> already been set and need to be reverted.

This could be accomplished by either:
- change to `derived.el', saving previous mode (this might be useful),
- change to `derived.el' by being reactive on exception (which is
valuable anyway, but there should be a way of telling to re-throw it).
- changing `image-mode' to something else and wrapping the rest into
`defun' (ad-hoc solution, which I like at least)
- having a flag that body should be executed before or after the body
generated by `define-derived-mode', or having a key, similar to
defadvice, (I wonder if EIEIO could help doing all of this..).

Ideally in case of saving previous mode we should have a stack for this
(even better, stack with functions that restore previous state, but this
might be an overkill).

I left it alone for time being, as the only drawback that user will
need to revert the mode by herself.

>
>> -(defun occur-mode ()
>> +(define-derived-mode occur-mode special-mode "Occur"
>>    "Major mode for output from \\[occur].
>>  \\<occur-mode-map>Move point to one of the items in this buffer, then use
>>  \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
>>  Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
>  
>>  \\{occur-mode-map}"
>> -  (interactive)
>>    (kill-all-local-variables)
>>    (use-local-map occur-mode-map)
>
> These last two should disappear as mentioned earlier.
>
>

Done.

BTW: Shall we have a special keyword for `derived-mode' that could possibly put together
default keyboard-map with mode (or allow user to use existing
keyboard-map), that would make developing new major modes more
consistent:

(define-derived-mode my-major-mode special-mode 
                                  :keymap 
                                  (("n" . 'my-next-page)
                                   ("C-s" . 'my-search))
                                   ...)
or

(define-derived-mode my-major-mode special-mode 
                                  :keymap 'my-major-mode-map
                                   ...)

AFAIK there is `configuration by convention' (post-fix `-map') but IMHO
it would be nicer if the keymaps could be defined in the body of the
macro. (and possibly merged with derive-mode-set-keymap). Maybe even we
can consider, generating a separate function for user init code (the
body of `define-derived-mode').

As you notice I also think that defining key-maps should be easier.
Generally maybe we should do what's been done with `easy-menu' for maps.

For convenience I am attaching set of patches each file separately, as
they are independent.

>         Stefan

Thanks,
Wojciech


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: arc-mode.el.diff --]
[-- Type: text/x-diff, Size: 4637 bytes --]

=== modified file 'lisp/arc-mode.el'
--- lisp/arc-mode.el	2010-07-10 18:52:53 +0000
+++ lisp/arc-mode.el	2010-09-13 00:49:20 +0000
@@ -341,7 +341,6 @@
 (defvar archive-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'archive-next-line)
     (define-key map "a" 'archive-alternate-display)
     ;;(define-key map "c" 'archive-copy)
     (define-key map "d" 'archive-flag-deleted)
@@ -349,15 +348,12 @@
     (define-key map "e" 'archive-extract)
     (define-key map "f" 'archive-extract)
     (define-key map "\C-m" 'archive-extract)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "h" 'describe-mode)
     (define-key map "m" 'archive-mark)
     (define-key map "n" 'archive-next-line)
     (define-key map "\C-n" 'archive-next-line)
     (define-key map [down] 'archive-next-line)
     (define-key map "o" 'archive-extract-other-window)
     (define-key map "p" 'archive-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\C-p" 'archive-previous-line)
     (define-key map [up] 'archive-previous-line)
     (define-key map "r" 'archive-rename-entry)
@@ -632,31 +628,16 @@
 		(error "Entry is not a regular member of the archive"))))
       (if (not noerror)
           (error "Line does not describe a member of the archive")))))
-;; -------------------------------------------------------------------------
-;;; Section: the mode definition
-
-;;;###autoload
-(defun archive-mode (&optional force)
-  "Major mode for viewing an archive file in a dired-like way.
-You can move around using the usual cursor motion commands.
-Letters no longer insert themselves.
-Type `e' to pull a file out of the archive and into its own buffer;
-or click mouse-2 on the file's line in the archive mode buffer.
-
-If you edit a sub-file of this archive (as with the `e' command) and
-save it, the contents of that buffer will be saved back into the
-archive.
-
-\\{archive-mode-map}"
-  ;; This is not interactive because you shouldn't be turning this
-  ;; mode on and off.  You can corrupt things that way.
+
+(defun archive-setup-mode (&optional force)
+  "Wrap all the mode setup code into separate function callable from 
+the package code."
   (if (zerop (buffer-size))
       ;; At present we cannot create archives from scratch
       (funcall (or (default-value 'major-mode) 'fundamental-mode))
     (if (and (not force) archive-files) nil
       (let* ((type (archive-find-type))
 	     (typename (capitalize (symbol-name type))))
-	(kill-all-local-variables)
 	(make-local-variable 'archive-subtype)
 	(setq archive-subtype type)
 
@@ -701,8 +682,7 @@
 	(setq major-mode 'archive-mode)
 	(setq mode-name (concat typename "-Archive"))
 	;; Run archive-foo-mode-hook and archive-mode-hook
-	(run-mode-hooks (archive-name "mode-hook") 'archive-mode-hook)
-	(use-local-map archive-mode-map))
+	(run-mode-hooks (archive-name "mode-hook") 'archive-mode-hook))
 
       (make-local-variable 'archive-proper-file-start)
       (make-local-variable 'archive-file-list-start)
@@ -717,6 +697,30 @@
       (archive-summarize nil)
       (setq buffer-read-only t))))
 
+;; -------------------------------------------------------------------------
+;;; Section: the mode definition
+
+;;;###autoload
+(define-derived-mode archive-mode special-mode "Archive mode"
+  "Major mode for viewing an archive file in a dired-like way.
+You can move around using the usual cursor motion commands.
+Letters no longer insert themselves.
+Type `e' to pull a file out of the archive and into its own buffer;
+or click mouse-2 on the file's line in the archive mode buffer.
+
+If you edit a sub-file of this archive (as with the `e' command) and
+save it, the contents of that buffer will be saved back into the
+archive.
+
+\\{archive-mode-map}"
+  ;; This is not interactive because you shouldn't be turning this
+  ;; mode on and off.  You can corrupt things that way.
+  ;;
+  ;; Now it's derived mode, so therefore it is interactive.
+  ;;
+  (archive-setup-mode))
+  
+
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)
 
@@ -888,7 +892,7 @@
 	  (setq archive-files nil)
 	  (erase-buffer)
 	  (insert-file-contents name)
-	  (archive-mode t)
+	  (archive-setup-mode t)
 	  (goto-char archive-file-list-start)
 	  (archive-next-line lno))
 	(archive-delete-local name)
@@ -1396,7 +1400,7 @@
     (let ((revert-buffer-function nil)
 	  (coding-system-for-read 'no-conversion))
       (revert-buffer t t))
-    (archive-mode)
+    (archive-setup-mode)
     (goto-char archive-file-list-start)
     (archive-next-line no)))
 


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: bookmark.el.diff --]
[-- Type: text/x-diff, Size: 3577 bytes --]

=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el	2010-07-14 19:09:28 +0000
+++ lisp/bookmark.el	2010-09-13 01:08:20 +0000
@@ -853,29 +853,22 @@
     (define-key map "\C-c\C-c" 'bookmark-send-edited-annotation)
     map)
   "Keymap for editing an annotation of a bookmark.")
-
-
-(defun bookmark-edit-annotation-mode (bookmark)
+ 
+(define-derived-mode bookmark-edit-annotation-mode nil "Edit Bookmark Annotation"
   "Mode for editing the annotation of bookmark BOOKMARK.
 When you have finished composing, type \\[bookmark-send-annotation].
 
 BOOKMARK is a bookmark name (a string) or a bookmark record.
 
 \\{bookmark-edit-annotation-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
+  (use-local-map bookmark-edit-annotation-mode-map)
   (make-local-variable 'bookmark-annotation-name)
-  (setq bookmark-annotation-name bookmark)
-  (use-local-map bookmark-edit-annotation-mode-map)
-  (setq major-mode 'bookmark-edit-annotation-mode
-        mode-name "Edit Bookmark Annotation")
   (insert (funcall bookmark-edit-annotation-text-func bookmark))
   (let ((annotation (bookmark-get-annotation bookmark)))
     (if (and annotation (not (string-equal annotation "")))
 	(insert annotation)))
   (run-mode-hooks 'text-mode-hook))
 
-
 (defun bookmark-send-edited-annotation ()
   "Use buffer contents as annotation for a bookmark.
 Lines beginning with `#' are ignored."
@@ -901,8 +894,8 @@
   "Pop up a buffer for editing bookmark BOOKMARK's annotation.
 BOOKMARK is a bookmark name (a string) or a bookmark record."
   (pop-to-buffer (generate-new-buffer-name "*Bookmark Annotation Compose*"))
-  (bookmark-edit-annotation-mode bookmark))
-
+  (bookmark-edit-annotation-mode)
+  (setq bookmark-annotation-name bookmark))
 
 (defun bookmark-insert-current-bookmark ()
   "Insert into the bookmark name currently being set the value of
@@ -1499,7 +1492,6 @@
 (defvar bookmark-bmenu-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map t)
-    (define-key map "q" 'quit-window)
     (define-key map "v" 'bookmark-bmenu-select)
     (define-key map "w" 'bookmark-bmenu-locate)
     (define-key map "2" 'bookmark-bmenu-2-window)
@@ -1515,11 +1507,9 @@
     (define-key map "\C-d" 'bookmark-bmenu-delete-backwards)
     (define-key map "x" 'bookmark-bmenu-execute-deletions)
     (define-key map "d" 'bookmark-bmenu-delete)
-    (define-key map " " 'next-line)
     (define-key map "n" 'next-line)
     (define-key map "p" 'previous-line)
     (define-key map "\177" 'bookmark-bmenu-backup-unmark)
-    (define-key map "?" 'describe-mode)
     (define-key map "u" 'bookmark-bmenu-unmark)
     (define-key map "m" 'bookmark-bmenu-mark)
     (define-key map "l" 'bookmark-bmenu-load)
@@ -1609,7 +1599,7 @@
 
 
 
-(defun bookmark-bmenu-mode ()
+(define-derived-mode bookmark-bmenu-mode special-mode "Bookmark Menu"
   "Major mode for editing a list of bookmarks.
 Each line describes one of the bookmarks in Emacs.
 Letters do not insert themselves; instead, they are commands.
@@ -1642,13 +1632,8 @@
   in another buffer.
 \\[bookmark-bmenu-show-all-annotations] -- show the annotations of all bookmarks in another buffer.
 \\[bookmark-bmenu-edit-annotation] -- edit the annotation for the current bookmark."
-  (kill-all-local-variables)
-  (use-local-map bookmark-bmenu-mode-map)
-  (setq truncate-lines t)
   (setq buffer-read-only t)
-  (setq major-mode 'bookmark-bmenu-mode)
-  (setq mode-name "Bookmark Menu")
-  (run-mode-hooks 'bookmark-bmenu-mode-hook))
+  (setq truncate-lines t))
 
 
 (defun bookmark-bmenu-toggle-filenames (&optional show)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: doc-view.el.diff --]
[-- Type: text/x-diff, Size: 2546 bytes --]

=== modified file 'lisp/doc-view.el'
--- lisp/doc-view.el	2010-07-14 15:57:54 +0000
+++ lisp/doc-view.el	2010-09-13 00:13:30 +0000
@@ -331,9 +331,7 @@
     (define-key map (kbd "C-c C-c")   'doc-view-toggle-display)
     ;; Open a new buffer with doc's text contents
     (define-key map (kbd "C-c C-t")   'doc-view-open-text)
-    ;; Reconvert the current document.  Don't just use revert-buffer
-    ;; because that resets the scale factor, the page number, ...
-    (define-key map (kbd "g")         'doc-view-revert-buffer)
+    ;; Reconvert the current document.
     (define-key map (kbd "r")         'doc-view-revert-buffer)
     map)
   "Keymap used by `doc-view-mode' when displaying a doc as a set of images.")
@@ -1207,7 +1205,7 @@
     l))
 
 ;;;###autoload
-(defun doc-view-mode ()
+(define-derived-mode doc-view-mode special-mode "Doc"
   "Major mode in DocView buffers.
 
 DocView Mode is an Emacs document viewer.  It displays PDF, PS
@@ -1216,7 +1214,6 @@
 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to
 toggle between displaying the document or editing it as text.
 \\{doc-view-mode-map}"
-  (interactive)
 
   (if (= (point-min) (point-max))
       ;; The doc is empty or doesn't exist at all, so fallback to
@@ -1229,7 +1226,6 @@
     (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode)
 				doc-view-previous-major-mode
 			      major-mode)))
-      (kill-all-local-variables)
       (set (make-local-variable 'doc-view-previous-major-mode) prev-major-mode))
 
     ;; Figure out the document type.
@@ -1307,20 +1303,17 @@
     (set (make-local-variable 'mwheel-scroll-down-function)
 	 'doc-view-scroll-down-or-previous-page)
     (set (make-local-variable 'cursor-type) nil)
-    (use-local-map doc-view-mode-map)
     (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
     (set (make-local-variable 'bookmark-make-record-function)
 	 'doc-view-bookmark-make-record)
-    (setq mode-name "DocView"
-	  buffer-read-only t
-	  major-mode 'doc-view-mode)
+    (setq buffer-read-only t)
     (doc-view-initiate-display)
     ;; Switch off view-mode explicitly, because doc-view-mode is the
     ;; canonical view mode for PDF/PS/DVI files.  This could be
     ;; switched on automatically depending on the value of
     ;; `view-read-only'.
     (set (make-local-variable 'view-read-only) nil)
-    (run-mode-hooks 'doc-view-mode-hook)))
+    (set (make-local-variable 'revert-buffer-function) 'doc-view-revert-buffer)))
 
 ;;;###autoload
 (define-minor-mode doc-view-minor-mode


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: image-mode.el.diff --]
[-- Type: text/x-diff, Size: 1504 bytes --]

=== modified file 'lisp/image-mode.el'
--- lisp/image-mode.el	2010-08-29 16:17:13 +0000
+++ lisp/image-mode.el	2010-09-13 00:10:56 +0000
@@ -315,9 +315,7 @@
 (defvar image-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
-    (define-key map "q"         'quit-window)
     (define-key map "\C-c\C-c" 'image-toggle-display)
-    (define-key map (kbd "SPC")       'image-scroll-up)
     (define-key map (kbd "DEL")       'image-scroll-down)
     (define-key map [remap forward-char] 'image-forward-hscroll)
     (define-key map [remap backward-char] 'image-backward-hscroll)
@@ -347,19 +345,16 @@
 (put 'image-mode 'mode-class 'special)
 
 ;;;###autoload
-(defun image-mode ()
+(define-derived-mode image-mode special-mode "Image"
   "Major mode for image files.
 You can use \\<image-mode-map>\\[image-toggle-display]
 to toggle between display as an image and display as text."
-  (interactive)
+  
   (condition-case err
       (progn
 	(unless (display-images-p)
 	  (error "Display does not support images"))
 
-	(kill-all-local-variables)
-	(setq major-mode 'image-mode)
-
 	(if (not (image-get-display-property))
 	    (progn
 	      (image-toggle-display-image)
@@ -372,7 +367,6 @@
 		image-type (plist-get (cdr (image-get-display-property)) :type)))
 
 	(setq mode-name (if image-type (format "Image[%s]" image-type) "Image"))
-	(use-local-map image-mode-map)
 
 	;; Use our own bookmarking function for images.
 	(set (make-local-variable 'bookmark-make-record-function)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: replace.el.diff --]
[-- Type: text/x-diff, Size: 1306 bytes --]

=== modified file 'lisp/replace.el'
--- lisp/replace.el	2010-08-29 16:17:13 +0000
+++ lisp/replace.el	2010-09-12 22:12:21 +0000
@@ -767,8 +767,6 @@
     (define-key map "\M-p" 'occur-prev)
     (define-key map "r" 'occur-rename-buffer)
     (define-key map "c" 'clone-buffer)
-    (define-key map "g" 'revert-buffer)
-    (define-key map "q" 'quit-window)
     (define-key map "z" 'kill-this-buffer)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
     (define-key map [menu-bar] (make-sparse-keymap))
@@ -835,18 +833,13 @@
   :group 'matching)
 
 (put 'occur-mode 'mode-class 'special)
-(defun occur-mode ()
+(define-derived-mode occur-mode special-mode "Occur"
   "Major mode for output from \\[occur].
 \\<occur-mode-map>Move point to one of the items in this buffer, then use
 \\[occur-mode-goto-occurrence] to go to the occurrence that the item refers to.
 Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
 
 \\{occur-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map occur-mode-map)
-  (setq major-mode 'occur-mode)
-  (setq mode-name "Occur")
   (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
   (make-local-variable 'occur-revert-arguments)
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: tar-mode.el.diff --]
[-- Type: text/x-diff, Size: 1413 bytes --]

=== modified file 'lisp/tar-mode.el'
--- lisp/tar-mode.el	2010-05-03 02:29:46 +0000
+++ lisp/tar-mode.el	2010-08-28 19:52:48 +0000
@@ -524,7 +524,6 @@
 (defvar tar-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map " " 'tar-next-line)
     (define-key map "C" 'tar-copy)
     (define-key map "d" 'tar-flag-deleted)
     (define-key map "\^D" 'tar-flag-deleted)
@@ -532,14 +531,12 @@
     (define-key map "f" 'tar-extract)
     (define-key map "\C-m" 'tar-extract)
     (define-key map [mouse-2] 'tar-mouse-extract)
-    (define-key map "g" 'revert-buffer)
     (define-key map "h" 'describe-mode)
     (define-key map "n" 'tar-next-line)
     (define-key map "\^N" 'tar-next-line)
     (define-key map [down] 'tar-next-line)
     (define-key map "o" 'tar-extract-other-window)
     (define-key map "p" 'tar-previous-line)
-    (define-key map "q" 'quit-window)
     (define-key map "\^P" 'tar-previous-line)
     (define-key map [up] 'tar-previous-line)
     (define-key map "R" 'tar-rename-entry)
@@ -615,7 +612,7 @@
   (if (buffer-live-p tar-data-buffer) (kill-buffer tar-data-buffer)))
 
 ;;;###autoload
-(define-derived-mode tar-mode nil "Tar"
+(define-derived-mode tar-mode special-mode "Tar"
   "Major mode for viewing a tar file as a dired-like listing of its contents.
 You can move around using the usual cursor motion commands.
 Letters no longer insert themselves.

Re: Refreshing Info nodes

[Stefan Monnier]

>>> +  ;; This is not interactive because you shouldn't be turning this
>>> +  ;; mode on and off.  You can corrupt things that way.
>>> +  ;;
>>> +  ;; Now it's derived mode, so therefore it is interactive.
>> 
>> These two pieces are contradictory, please clarify.  BTW, we should
>> change archive-mode to use buffer-swap-text like we did for tar-mode,
>> which should address this risk of corruption.

> Done. I am investigating possibility of using swap-buffer with
> archive-mode.

Great, but note that it's a separate issue to the one of using special-mode.

> BTW: Maybe we should think about merging (at least reusing bits & pieces
> and making user interface more consistent) tar-mode <-> archive-mode?

Yes, bringing them closer would be good, indeed.

> - changing `image-mode' to something else and wrapping the rest into
> `defun' (ad-hoc solution, which I like at least)

This solution you like least is the right one: image-mode should really
be a command that sets the major-mode to image-mode, not a command that
tries it and does something else if it can't be done.  I.e. we need
a separate command to do the "check if image-mode can be used, and call
image-mode if possible".

> Ideally in case of saving previous mode we should have a stack for this
> (even better, stack with functions that restore previous state, but this
> might be an overkill).

The user might want to switch in a circular rather than stack fashion.
Since we don't know how best to solve this general case, we stick to the
only really use case we know, where the user switches between two modes
(the doc-view/image-mode and the "see raw data" mode (can be
fundamental-mode, ps-mode, c-mode, ...)).

> (define-derived-mode my-major-mode special-mode 
>                                   :keymap 
>                                   (("n" . 'my-next-page)
>                                    ("C-s" . 'my-search))
>                                    ...)

We could, but a separate variable isn't that much hassle.

> (define-derived-mode my-major-mode special-mode 
>                                   :keymap 'my-major-mode-map
>                                    ...)

This would encourage the use of non-standard naming, so I'd rather not
go down that road.

> As you notice I also think that defining key-maps should be easier.
> Generally maybe we should do what's been done with `easy-menu' for maps.

As you may have noticed in easy-mmode-define-keymap, I've toyed with
this idea in the past.  Maybe a `defkeymap' macro would be good, indeed,
but it's not that important, I think.

> +(define-derived-mode archive-mode special-mode "Archive mode"
[...]
>  ;; Archive mode is suitable only for specially formatted data.
>  (put 'archive-mode 'mode-class 'special)

The above line is made redundant by deriving from special-mode.

> +(define-derived-mode bookmark-edit-annotation-mode nil "Edit Bookmark Annotation"
[...]
>    (run-mode-hooks 'text-mode-hook))

This run-mode-hooks is a good hint that the mode should actually derive
from text-mode-hook.

>  (put 'occur-mode 'mode-class 'special)
> -(defun occur-mode ()
> +(define-derived-mode occur-mode special-mode "Occur"

Here also, the `put' is now redundant.


        Stefan

Re: Refreshing Info nodes

[Wojciech Meyer]

On Mon, Sep 13, 2010 at 11:11 AM, Stefan Monnier
<monnier@iro.umontreal.ca> wrote:
>> Done. I am investigating possibility of using swap-buffer with
>> archive-mode.
>
> Great, but note that it's a separate issue to the one of using special-mode.

I know.. and I thought I could look at it later.

>
>> BTW: Maybe we should think about merging (at least reusing bits & pieces
>> and making user interface more consistent) tar-mode <-> archive-mode?
>
> Yes, bringing them closer would be good, indeed.
>
>> - changing `image-mode' to something else and wrapping the rest into
>> `defun' (ad-hoc solution, which I like at least)
>
> This solution you like least is the right one: image-mode should really
> be a command that sets the major-mode to image-mode, not a command that
> tries it and does something else if it can't be done.  I.e. we need
> a separate command to do the "check if image-mode can be used, and call
> image-mode if possible".
>

OK.

>> Ideally in case of saving previous mode we should have a stack for this
>> (even better, stack with functions that restore previous state, but this
>> might be an overkill).
>
> The user might want to switch in a circular rather than stack fashion.
> Since we don't know how best to solve this general case, we stick to the
> only really use case we know, where the user switches between two modes
> (the doc-view/image-mode and the "see raw data" mode (can be
> fundamental-mode, ps-mode, c-mode, ...)).

Yes, I will do just major-mode swap for time being.

>
>> (define-derived-mode my-major-mode special-mode
>>                                   :keymap 'my-major-mode-map
>>                                    ...)
>
> This would encourage the use of non-standard naming, so I'd rather not
> go down that road.

Actually that's what i though initially.

>
>> As you notice I also think that defining key-maps should be easier.
>> Generally maybe we should do what's been done with `easy-menu' for maps.
>
> As you may have noticed in easy-mmode-define-keymap, I've toyed with
> this idea in the past.  Maybe a `defkeymap' macro would be good, indeed,
> but it's not that important, I think.
>
>> +(define-derived-mode archive-mode special-mode "Archive mode"
> [...]
>>  ;; Archive mode is suitable only for specially formatted data.
>>  (put 'archive-mode 'mode-class 'special)

In the begining, I was not sure if i should leave those lines.

>
> The above line is made redundant by deriving from special-mode.
>
>> +(define-derived-mode bookmark-edit-annotation-mode nil "Edit Bookmark Annotation"
> [...]
>>    (run-mode-hooks 'text-mode-hook))
>
> This run-mode-hooks is a good hint that the mode should actually derive
> from text-mode-hook.

That was my consideration too.

>
>>  (put 'occur-mode 'mode-class 'special)
>> -(defun occur-mode ()
>> +(define-derived-mode occur-mode special-mode "Occur"
>
> Here also, the `put' is now redundant.

Yes.

>
>
>        Stefan
>

Thank you,
I will send the final version soon.
Wojciech