Commits

Anonymous committed c0ef534

Fix let bindings in vc-update-changelog-rcs2log.

Comments (0)

Files changed (2)

+2009-12-26  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Thanks to "It's me FKtPp ;\)" on XEmacs Patches
+	<87iqbv6ufi.fsf@yahoo.com.cn>.  Substantially changed from
+	original patch, responsibility for errors is committer's.
+
+	* vc.el (vc-update-changelog-rcs2log):
+	Adjust let bindings for XEmacs.  Use functions instead of
+	variables, fix type mismatches in calls to format.
+
 2009-03-02  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.46 released.
   "Default implementation of update-changelog.
 Uses `rcs2log' which only works for RCS and CVS."
   ;; FIXME: We (c|sh)ould add support for cvs2cl
-  (let ((odefault default-directory)
-	(changelog (find-change-log))
-	;; Presumably not portable to non-Unixy systems, along with rcs2log:
-	(tempfile (make-temp-file
-		   ;; XEmacs change: no `small-temporary-file-directory'
-		   (expand-file-name "vc" temporary-file-directory)))
-        (login-name (or user-login-name
-                        (format "uid%d" (number-to-string (user-uid)))))
-	(full-name (or add-log-full-name
-		       (user-full-name)
-		       (user-login-name)
-		       (format "uid%d" (number-to-string (user-uid)))))
-	(mailing-address (or add-log-mailing-address
-			     user-mail-address)))
+  ;; XEmacs change: about half the let bindings were broken, either in
+  ;; principle or because they used variables XEmacs doesn't have
+  (let* ((odefault default-directory)
+	 (changelog (find-change-log))
+	 ;; Presumably not portable to non-Unixy systems, along with rcs2log:
+	 (tempfile (make-temp-file
+		    (expand-file-name "vc" temporary-file-directory)))
+	 (login-name (or user-login-name (format "uid%d" (user-uid))))
+	 (full-name (or add-log-full-name (user-full-name) login-name))
+	 (mailing-address (or add-log-mailing-address user-mail-address)))
     (find-file-other-window changelog)
     (barf-if-buffer-read-only)
     (vc-buffer-sync)