bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[積丹尼 Dan Jacobson]

$ emacs -q directory_that_contains_a_.gz_file
v on that file. (view mode)
C-s some_string, C-s C-s C-s C-s C-s ... but then instead of wrapping
around back to the top, we get
File not found and directory write-protected

By the way, it happened on a changelog.gz
file, and the prompt was "Multi I-Search" whatever that means.

Debian emacs 24.3+1-5
emacs-version "24.3.1"

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[Juri Linkov]

> $ emacs -q directory_that_contains_a_.gz_file
> v on that file. (view mode)
> C-s some_string, C-s C-s C-s C-s C-s ... but then instead of wrapping
> around back to the top, we get
> File not found and directory write-protected
>
> By the way, it happened on a changelog.gz
> file, and the prompt was "Multi I-Search" whatever that means.

It fails because you are using a non-standard file name
"changelog", and not the default "ChangeLog".  You can customize
`change-log-default-name' to "changelog" then isearch will wrap
to the beginning instead of trying to wrap to a non-existent "ChangeLog".

I'm not sure whether we should deduce change-log-name from the
file name of the current buffer (removing possible suffixes
like ".10" from "changelog.10").

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[積丹尼 Dan Jacobson]

On my system
# dlocate changelog|wc -l
2233
# dlocate ChangeLog|wc -l
44
that's all I know.

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[Stefan Monnier]

>> File not found and directory write-protected
[...]
> It fails because you are using a non-standard file name
> "changelog", and not the default "ChangeLog".  You can customize
> `change-log-default-name' to "changelog" then isearch will wrap
> to the beginning instead of trying to wrap to a non-existent "ChangeLog".

I think failing to switch to another file is fine, but it should
still wrap around, and it should not burp at the user about some
non-existing file.


        Stefan

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[Juri Linkov]

>>> File not found and directory write-protected
> [...]
>> It fails because you are using a non-standard file name
>> "changelog", and not the default "ChangeLog".  You can customize
>> `change-log-default-name' to "changelog" then isearch will wrap
>> to the beginning instead of trying to wrap to a non-existent "ChangeLog".
>
> I think failing to switch to another file is fine, but it should
> still wrap around, and it should not burp at the user about some
> non-existing file.

Then if there are no files that fit the default naming scheme ChangeLog[.NN],
this patch will wrap around in the current buffer.  (I'm not sure whether
it should go into emacs-24 or trunk):

=== modified file 'lisp/vc/add-log.el'
--- lisp/vc/add-log.el	2014-02-10 01:34:22 +0000
+++ lisp/vc/add-log.el	2014-09-24 22:17:34 +0000
@@ -1097,12 +1097,14 @@ (defun change-log-next-buffer (&optional
                                    (ignore-errors
                                      (version< (substring b (length name))
                                                (substring a (length name))))))))
-	 (files (if isearch-forward files (reverse files))))
-    (find-file-noselect
-     (if wrap
-	 (car files)
-       (cadr (member (file-name-nondirectory (buffer-file-name buffer))
-		     files))))))
+	 (files (if isearch-forward files (reverse files)))
+	 (file (if wrap
+		   (car files)
+		 (cadr (member (file-name-nondirectory (buffer-file-name buffer))
+			       files)))))
+    (if (file-exists-p file)
+	(find-file-noselect file)
+      (current-buffer))))
 
 (defun change-log-fill-forward-paragraph (n)
   "Cut paragraphs so filling preserves open parentheses at beginning of lines."

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[Stefan Monnier]

> Then if there are no files that fit the default naming scheme ChangeLog[.NN],
> this patch will wrap around in the current buffer.

Thanks Juri.

> (I'm not sure whether it should go into emacs-24 or trunk):

I don't think it's urgent, so: trunk.


        Stefan

bug#18547: repeated C-s doesn't wrap back to the top if file is .gz

[Juri Linkov]

>> (I'm not sure whether it should go into emacs-24 or trunk):
>
> I don't think it's urgent, so: trunk.

Actually there were two cases: when `wrap' is non-nil then a new buffer
"ChangeLog" should not be created (fixes the reported problem).
When `wrap' is nil, then `file-exists-p' will raise a signal
(as `find-file-noselect' did before this patch) that is handled
by `multi-isearch-search-fun' to display the "end of multi" message.
The same patch installed to trunk will handle both cases.