emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r106756: * emacs-lisp/bytecomp.el (by


From: Andreas Schwab
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r106756: * emacs-lisp/bytecomp.el (byte-compile-file): Fix indentation.
Date: Sat, 31 Dec 2011 15:43:38 +0100
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 106756
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-12-31 15:43:38 +0100
message:
  * emacs-lisp/bytecomp.el (byte-compile-file): Fix indentation.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-31 10:06:21 +0000
+++ b/lisp/ChangeLog    2011-12-31 14:43:38 +0000
@@ -1,3 +1,7 @@
+2011-12-31  Andreas Schwab  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-compile-file): Fix indentation.
+
 2011-12-31  Eli Zaretskii  <address@hidden>
 
        * mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2011-12-30 02:52:49 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2011-12-31 14:43:38 +0000
@@ -1779,37 +1779,37 @@
        (with-current-buffer output-buffer
          (goto-char (point-max))
          (insert "\n")                 ; aaah, unix.
-           (if (file-writable-p target-file)
-               ;; We must disable any code conversion here.
-               (let* ((coding-system-for-write 'no-conversion)
-                      ;; Write to a tempfile so that if another Emacs
-                      ;; process is trying to load target-file (eg in a
-                      ;; parallel bootstrap), it does not risk getting a
-                      ;; half-finished file.  (Bug#4196)
-                      (tempfile (make-temp-name target-file))
-                      (kill-emacs-hook
-                       (cons (lambda () (ignore-errors (delete-file tempfile)))
-                             kill-emacs-hook)))
-                 (if (memq system-type '(ms-dos 'windows-nt))
-                     (setq buffer-file-type t))
-                 (write-region (point-min) (point-max) tempfile nil 1)
-                 ;; This has the intentional side effect that any
-                 ;; hard-links to target-file continue to
-                 ;; point to the old file (this makes it possible
-                 ;; for installed files to share disk space with
-                 ;; the build tree, without causing problems when
-                 ;; emacs-lisp files in the build tree are
-                 ;; recompiled).  Previously this was accomplished by
-                 ;; deleting target-file before writing it.
-                 (rename-file tempfile target-file t)
-                 (message "Wrote %s" target-file))
-             ;; This is just to give a better error message than write-region
-             (signal 'file-error
-                     (list "Opening output file"
-                           (if (file-exists-p target-file)
-                               "cannot overwrite file"
-                             "directory not writable or nonexistent")
-                           target-file)))
+         (if (file-writable-p target-file)
+             ;; We must disable any code conversion here.
+             (let* ((coding-system-for-write 'no-conversion)
+                    ;; Write to a tempfile so that if another Emacs
+                    ;; process is trying to load target-file (eg in a
+                    ;; parallel bootstrap), it does not risk getting a
+                    ;; half-finished file.  (Bug#4196)
+                    (tempfile (make-temp-name target-file))
+                    (kill-emacs-hook
+                     (cons (lambda () (ignore-errors (delete-file tempfile)))
+                           kill-emacs-hook)))
+               (if (memq system-type '(ms-dos 'windows-nt))
+                   (setq buffer-file-type t))
+               (write-region (point-min) (point-max) tempfile nil 1)
+               ;; This has the intentional side effect that any
+               ;; hard-links to target-file continue to
+               ;; point to the old file (this makes it possible
+               ;; for installed files to share disk space with
+               ;; the build tree, without causing problems when
+               ;; emacs-lisp files in the build tree are
+               ;; recompiled).  Previously this was accomplished by
+               ;; deleting target-file before writing it.
+               (rename-file tempfile target-file t)
+               (message "Wrote %s" target-file))
+           ;; This is just to give a better error message than write-region
+           (signal 'file-error
+                   (list "Opening output file"
+                         (if (file-exists-p target-file)
+                             "cannot overwrite file"
+                           "directory not writable or nonexistent")
+                         target-file)))
          (kill-buffer (current-buffer)))
        (if (and byte-compile-generate-call-tree
                 (or (eq t byte-compile-generate-call-tree)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]