[Emacs-diffs] /srv/bzr/emacs/trunk r103959: * lisp/progmodes/flymake.el (flymake-start-syntax-check-process): Obey `dir'.

[Stefan Monnier]

------------------------------------------------------------
revno: 103959
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2011-04-20 15:08:21 -0300
message:
  * lisp/progmodes/flymake.el (flymake-start-syntax-check-process): Obey `dir'.
modified:
  lisp/ChangeLog
  lisp/progmodes/flymake.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-20 17:39:39 +0000
+++ b/lisp/ChangeLog    2011-04-20 18:08:21 +0000
@@ -1,5 +1,8 @@
 2011-04-20  Stefan Monnier  <address@hidden>
 
+       * progmodes/flymake.el (flymake-start-syntax-check-process):
+       Obey `dir'.  Simplify.
+
        * vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
        we're in VC after all.
 

=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2011-01-26 08:36:39 +0000
+++ b/lisp/progmodes/flymake.el 2011-04-20 18:08:21 +0000
@@ -1152,35 +1152,34 @@
 
 (defun flymake-start-syntax-check-process (cmd args dir)
   "Start syntax check process."
-  (let* ((process nil))
-    (condition-case err
-       (progn
-         (when dir
-           (let ((default-directory dir))
-             (flymake-log 3 "starting process on dir %s" default-directory)))
-         (setq process (apply 'start-file-process
-                              "flymake-proc" (current-buffer) cmd args))
-         (set-process-sentinel process 'flymake-process-sentinel)
-         (set-process-filter process 'flymake-process-filter)
-          (push process flymake-processes)
-
-          (setq flymake-is-running t)
-          (setq flymake-last-change-time nil)
-          (setq flymake-check-start-time (flymake-float-time))
-
-         (flymake-report-status nil "*")
-         (flymake-log 2 "started process %d, command=%s, dir=%s"
-                      (process-id process) (process-command process)
-                       default-directory)
-         process)
-      (error
-       (let* ((err-str (format "Failed to launch syntax check process '%s' 
with args %s: %s"
-                              cmd args (error-message-string err)))
-             (source-file-name buffer-file-name)
-             (cleanup-f        (flymake-get-cleanup-function 
source-file-name)))
-        (flymake-log 0 err-str)
-        (funcall cleanup-f)
-        (flymake-report-fatal-status "PROCERR" err-str))))))
+  (condition-case err
+      (let* ((process
+              (let ((default-directory (or dir default-directory)))
+                (when dir
+                  (flymake-log 3 "starting process on dir %s" dir))
+                (apply 'start-file-process
+                       "flymake-proc" (current-buffer) cmd args))))
+        (set-process-sentinel process 'flymake-process-sentinel)
+        (set-process-filter process 'flymake-process-filter)
+        (push process flymake-processes)
+
+        (setq flymake-is-running t)
+        (setq flymake-last-change-time nil)
+        (setq flymake-check-start-time (flymake-float-time))
+
+        (flymake-report-status nil "*")
+        (flymake-log 2 "started process %d, command=%s, dir=%s"
+                     (process-id process) (process-command process)
+                     default-directory)
+        process)
+    (error
+     (let* ((err-str (format "Failed to launch syntax check process '%s' with 
args %s: %s"
+                             cmd args (error-message-string err)))
+            (source-file-name buffer-file-name)
+            (cleanup-f        (flymake-get-cleanup-function source-file-name)))
+       (flymake-log 0 err-str)
+       (funcall cleanup-f)
+       (flymake-report-fatal-status "PROCERR" err-str)))))
 
 (defun flymake-kill-process (proc)
   "Kill process PROC."