log-edit.el

log-edit.el

[Nick Roberts]

log-edit-insert-changelog (C-c C-a) picks up files with similar names e.g


2005-05-24  Nick Roberts  <nickrob@snap.net.nz>

	* xmenu.c (Fx_popup_dialog): Add a third boolean argument to
	select frame title ("Question"/"Information").
	(xdialog_show): Use it.

	* macmenu.c (Fx_popup_dialog, mac_dialog_show): As for xmenu.c.

	* w32menu.c (Fx_popup_dialog, w32_dialog_show): As for xmenu.c.

	* fns.c (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
	a third argument (Qnil).

	* lisp.h: x-popup-dialog can have three arguments.

	* editfns.c (Fmessage_box): Use "Information" for frame title.


vc-nect-action in fns.c (C-v v v) followed by C-c C-a picks up:

* fns.c (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
a third argument (Qnil).

* editfns.c (Fmessage_box): Use "Information" for frame title.


How about the patch below to stop this?

Also, I use log-edit-insert-changelog all the time but never use pcl-cvs.
How about moving the node about log-edit from the pcl-cvs manual into
the Emacs manual?

Nick

*** /home/nick/emacs/lisp/log-edit.el.~1.28.~	2005-02-10 08:22:49.000000000 +1300
--- /home/nick/emacs/lisp/log-edit.el	2005-05-25 22:52:52.000000000 +1200
***************
*** 632,638 ****
      ;; Add each buffer to buffer-entries, and associate it with the list
      ;; of entries we want from that file.
      (dolist (file files)
!       (let* ((entries (log-edit-changelog-entries file))
               (pair (assq (car entries) buffer-entries)))
          (if pair
              (setcdr pair (cvs-union (cdr pair) (cdr entries)))
--- 632,639 ----
      ;; Add each buffer to buffer-entries, and associate it with the list
      ;; of entries we want from that file.
      (dolist (file files)
!       ;; Prefix filename with a space to distinguish e.g fns.c xfns.c.
!       (let* ((entries (log-edit-changelog-entries (concat " " file)))
               (pair (assq (car entries) buffer-entries)))
          (if pair
              (setcdr pair (cvs-union (cdr pair) (cdr entries)))

Re: log-edit.el

[Stefan Monnier]

> vc-nect-action in fns.c (C-v v v) followed by C-c C-a picks up:
> * fns.c (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
> a third argument (Qnil).
> * editfns.c (Fmessage_box): Use "Information" for frame title.

> How about the patch below to stop this?

This idea might be OK, but the place to add a " " is not where you put it
but inside log-edit-changelog-entries where we do a (search-forward
pattern).

Is the patch below working for you?

> Also, I use log-edit-insert-changelog all the time but never use pcl-cvs.
> How about moving the node about log-edit from the pcl-cvs manual into
> the Emacs manual?

No objection here,


        Stefan


--- orig/lisp/log-edit.el
+++ mod/lisp/log-edit.el
@@ -616,8 +616,12 @@
 			   (search-forward pattern nil t))))
 		(setq pattern (file-name-nondirectory file)))
 
+            (setq pattern (concat "\\(^\\|[^[:alnum:]]\\)"
+                                  pattern
+                                  "\\($\\|[^[:alnum:]]\\)"))
+
 	    (let (texts)
-	      (while (search-forward pattern nil t)
+	      (while (re-search-forward pattern nil t)
 		(let ((entry (log-edit-changelog-entry)))
 		  (push entry texts)
 		  (goto-char (elt entry 1))))
@@ -655,5 +659,5 @@
 
 (provide 'log-edit)
 
-;;; arch-tag: 8089b39c-983b-4e83-93cd-ed0a64c7fdcc
+;; arch-tag: 8089b39c-983b-4e83-93cd-ed0a64c7fdcc
 ;;; log-edit.el ends here

Re: log-edit.el

[Nick Roberts]

 > This idea might be OK, but the place to add a " " is not where you put it
 > but inside log-edit-changelog-entries where we do a (search-forward
 > pattern).
 > 
 > Is the patch below working for you?

Yes. I've committed it.

 > > Also, I use log-edit-insert-changelog all the time but never use pcl-cvs.
 > > How about moving the node about log-edit from the pcl-cvs manual into
 > > the Emacs manual?
 > 
 > No objection here,

OK, I will merge the node "Editing a Log Message" from the pcl-cvs manual
into the node "Features of the Log Entry Buffer" in the Emacs manual.

Nick

Re: log-edit.el

[Richard Stallman]

	  (dolist (file files)
    !       ;; Prefix filename with a space to distinguish e.g fns.c xfns.c.
    !       (let* ((entries (log-edit-changelog-entries (concat " " file)))

This change is clearly the wrong way to do it.
The argument to log-edit-changelog-entries is supposed to be a file name.
If it doesn't work, you should fix it, not enshrine the error
by passing an arg that is not a file name.

    Also, I use log-edit-insert-changelog all the time but never use pcl-cvs.
    How about moving the node about log-edit from the pcl-cvs manual into
    the Emacs manual?

Ok, please do.

     > No objection here,

    OK, I will merge the node "Editing a Log Message" from the pcl-cvs manual
    into the node "Features of the Log Entry Buffer" in the Emacs manual.

When you propose to rearrange the manual, please wait for me to ok it.
Please don't go ahead and do it just because a single other person
says he likes the idea.

Re: log-edit.el

[Nick Roberts]

 >     Also, I use log-edit-insert-changelog all the time but never use pcl-cvs.
 >     How about moving the node about log-edit from the pcl-cvs manual into
 >     the Emacs manual?
 > 
 > Ok, please do.
 > 
 >      > No objection here,
 > 
 >     OK, I will merge the node "Editing a Log Message" from the pcl-cvs manual
 >     into the node "Features of the Log Entry Buffer" in the Emacs manual.
 > 
 > When you propose to rearrange the manual, please wait for me to ok it.
 > Please don't go ahead and do it just because a single other person
 > says he likes the idea.

Its just a statement of intent. I realise that if did I go ahead and install a
change that you don't like, I might have to take it out.  But even then it
would only be my time that I've wasted.  At least I have explained my
reasoning on the mailing list.  Compare that to the changes in make-mode.el.
Who, apart from the author and perhaps yourself, knows whats thats all about?

Nick

Re: log-edit.el

[Richard Stallman]

     >     OK, I will merge the node "Editing a Log Message" from the pcl-cvs manual
     >     into the node "Features of the Log Entry Buffer" in the Emacs manual.

    Its just a statement of intent.

Ok, but you did not say so.

    Compare that to the changes in make-mode.el.
    Who, apart from the author and perhaps yourself, knows whats thats all about?

That shouldn't be the standard of comparison.
We all agree he should not have done that.

Re: log-edit.el

[Nick Roberts]

Richard Stallman writes:
 > 	  (dolist (file files)
 >     !       ;; Prefix filename with a space to distinguish e.g fns.c xfns.c.
 >     !       (let* ((entries (log-edit-changelog-entries (concat " " file)))
 > 
 > This change is clearly the wrong way to do it.
 > The argument to log-edit-changelog-entries is supposed to be a file name.
 > If it doesn't work, you should fix it, not enshrine the error
 > by passing an arg that is not a file name.

Yes. But it did motivate Stefan to provide a proper patch.

Nick

Re: log-edit.el

[Richard Stallman]

     > This change is clearly the wrong way to do it.
     (technical reasons)

    Yes. But it did motivate Stefan to provide a proper patch.

I agree, your intervention helped bring the right outcome.  However,
it wasn't perfect.  If you think about these issues, it will help you
write exactly the right patch, next time.