* [PATCH] Fix bootstrap build of files.el [not found] <8760hdlnux.fsf@users.sourceforge.net> @ 2017-05-06 21:21 ` Philipp 2017-05-07 1:24 ` Glenn Morris 0 siblings, 1 reply; 3+ messages in thread From: Philipp @ 2017-05-06 21:21 UTC (permalink / raw) To: rgm, npostavs, emacs-devel, 25951; +Cc: Philipp * lisp/files.el (file-name-non-special): Don't use cl-letf. --- lisp/files.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 7e627d36d4..8ac1993754 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -29,7 +29,6 @@ ;;; Code: (eval-when-compile - (require 'cl-lib) (require 'pcase) (require 'easy-mmode)) ; For `define-minor-mode'. @@ -7032,13 +7031,18 @@ file-name-non-special (when (and visit buffer-file-name) (setq buffer-file-name (concat "/:" buffer-file-name)))))) (`unquote-then-quote - (cl-letf* ((buffer (or (car arguments) (current-buffer))) - ((buffer-local-value 'buffer-file-name buffer) - (substring (buffer-file-name buffer) 2))) + ;; We can't use `cl-letf' with `(buffer-local-value)' here + ;; because it wouldn't work during bootstrapping. + (let ((buffer (current-buffer))) ;; `unquote-then-quote' is only used for the ;; `verify-visited-file-modtime' action, which takes a buffer ;; as only optional argument. - (apply operation arguments))) + (with-current-buffer (or (car arguments) buffer) + (let ((buffer-file-name (substring buffer-file-name 2))) + ;; Make sure to hide the temporary buffer change from the + ;; underlying operation. + (with-current-buffer buffer + (apply operation arguments)))))) (_ (apply operation arguments))))) -- 2.12.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix bootstrap build of files.el 2017-05-06 21:21 ` [PATCH] Fix bootstrap build of files.el Philipp @ 2017-05-07 1:24 ` Glenn Morris 2017-05-07 11:35 ` Philipp 0 siblings, 1 reply; 3+ messages in thread From: Glenn Morris @ 2017-05-07 1:24 UTC (permalink / raw) To: Philipp; +Cc: Philipp, 25951, emacs-devel, npostavs We have a diffs mailing list, so you don't need to send your patches to two other mailing lists as well. ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix bootstrap build of files.el 2017-05-07 1:24 ` Glenn Morris @ 2017-05-07 11:35 ` Philipp 0 siblings, 0 replies; 3+ messages in thread From: Philipp @ 2017-05-07 11:35 UTC (permalink / raw) To: Glenn Morris; +Cc: Philipp, 25951, npostavs, emacs-devel [-- Attachment #1: Type: text/plain, Size: 323 bytes --] Glenn Morris <rgm@gnu.org> schrieb am So., 7. Mai 2017 um 03:25 Uhr: > > We have a diffs mailing list, so you don't need to send your patches to > two other mailing lists as well. > > Yes, I just wanted to have my patch reviewed before committing, but since it broke bootstrapping I decided to install it without review. [-- Attachment #2: Type: text/html, Size: 618 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-07 11:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <8760hdlnux.fsf@users.sourceforge.net>
2017-05-06 21:21 ` [PATCH] Fix bootstrap build of files.el Philipp
2017-05-07 1:24 ` Glenn Morris
2017-05-07 11:35 ` Philipp
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).