[Emacs-diffs] emacs/lisp ChangeLog ediff-merg.el filesets.el ...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/13 02:14:29

Modified files:
        lisp           : ChangeLog ediff-merg.el filesets.el 
        lisp/emulation : ws-mode.el 

Log message:
        Replace empty `let's with `progn'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16154&r2=1.16155
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-merg.el?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/filesets.el?cvsroot=emacs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/ws-mode.el?cvsroot=emacs&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16154
retrieving revision 1.16155
diff -u -b -r1.16154 -r1.16155
--- ChangeLog   13 Sep 2009 00:52:55 -0000      1.16154
+++ ChangeLog   13 Sep 2009 02:14:25 -0000      1.16155
@@ -1,3 +1,14 @@
+2009-09-13  Glenn Morris  <address@hidden>
+
+       * ediff-merg.el (ediff-do-merge):
+       * filesets.el (filesets-run-cmd):
+       * emulation/ws-mode.el (ws-show-markers, ws-move-block, ws-delete-block)
+       (ws-find-marker-0, ws-find-marker-1, ws-find-marker-2, ws-find-marker-3)
+       (ws-find-marker-4, ws-find-marker-5, ws-find-marker-6, ws-find-marker-7)
+       (ws-find-marker-8, ws-find-marker-9, ws-goto-block-begin)
+       (ws-goto-block-end, ws-goto-last-cursorposition, ws-copy-block):
+       Replace empty `let's with `progn'.
+
 2009-09-13  Stefan Monnier  <address@hidden>
 
        * mail/sendmail.el (send-mail-function):

Index: ediff-merg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-merg.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- ediff-merg.el       15 Aug 2009 05:57:12 -0000      1.44
+++ ediff-merg.el       13 Sep 2009 02:14:28 -0000      1.45
@@ -226,7 +226,7 @@
          ;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
          ;;    (reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
          ;;    (reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))
-         (let ()
+         (progn
 
            ;; if region was edited since it was first set by default
            (if (or (ediff-merge-changed-from-default-p n)

Index: filesets.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/filesets.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- filesets.el 5 Jan 2009 03:19:09 -0000       1.47
+++ filesets.el 13 Sep 2009 02:14:28 -0000      1.48
@@ -1641,7 +1641,7 @@
                    (let ((buffer (filesets-find-file this)))
                      (when buffer
                        (goto-char (point-min))
-                       (let ()
+                       (progn
                          (cond
                           ((stringp fn)
                            (let* ((args

Index: emulation/ws-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/ws-mode.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- emulation/ws-mode.el        5 Jan 2009 03:21:24 -0000       1.33
+++ emulation/ws-mode.el        13 Sep 2009 02:14:29 -0000      1.34
@@ -1,7 +1,7 @@
 ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
 
-;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009  Free Software Foundation, Inc.
 
 ;; Author: Juergen Nickelsen <address@hidden>
 ;; Version: 0.7
@@ -457,14 +457,14 @@
   (if (or ws-block-begin-marker ws-block-end-marker)
       (save-excursion
        (if ws-block-begin-marker
-           (let ()
+           (progn
              (goto-char ws-block-begin-marker)
              (message "Block begin marker")
              (sit-for 2))
          (message "Block begin marker not set")
          (sit-for 2))
        (if ws-block-end-marker
-           (let ()
+           (progn
              (goto-char ws-block-end-marker)
              (message "Block end marker")
              (sit-for 2))
@@ -509,7 +509,7 @@
   "In WordStar mode: Move block to current cursor position."
   (interactive)
   (if (and ws-block-begin-marker ws-block-end-marker)
-      (let ()
+      (progn
        (kill-region ws-block-begin-marker ws-block-end-marker)
        (yank)
        (save-excursion
@@ -536,7 +536,7 @@
   "In WordStar mode: Delete block."
   (interactive)
   (if (and ws-block-begin-marker ws-block-end-marker)
-      (let ()
+      (progn
        (kill-region ws-block-begin-marker ws-block-end-marker)
        (setq ws-block-end-marker nil)
        (setq ws-block-begin-marker nil))
@@ -548,7 +548,7 @@
   "In WordStar mode: Go to marker 0."
   (interactive)
   (if ws-marker-0
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-0))
     (ws-error "Marker 0 not set")))
@@ -557,7 +557,7 @@
   "In WordStar mode: Go to marker 1."
   (interactive)
   (if ws-marker-1
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-1))
     (ws-error "Marker 1 not set")))
@@ -566,7 +566,7 @@
   "In WordStar mode: Go to marker 2."
   (interactive)
   (if ws-marker-2
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-2))
     (ws-error "Marker 2 not set")))
@@ -575,7 +575,7 @@
   "In WordStar mode: Go to marker 3."
   (interactive)
   (if ws-marker-3
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-3))
     (ws-error "Marker 3 not set")))
@@ -584,7 +584,7 @@
   "In WordStar mode: Go to marker 4."
   (interactive)
   (if ws-marker-4
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-4))
     (ws-error "Marker 4 not set")))
@@ -593,7 +593,7 @@
   "In WordStar mode: Go to marker 5."
   (interactive)
   (if ws-marker-5
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-5))
     (ws-error "Marker 5 not set")))
@@ -602,7 +602,7 @@
   "In WordStar mode: Go to marker 6."
   (interactive)
   (if ws-marker-6
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-6))
     (ws-error "Marker 6 not set")))
@@ -611,7 +611,7 @@
   "In WordStar mode: Go to marker 7."
   (interactive)
   (if ws-marker-7
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-7))
     (ws-error "Marker 7 not set")))
@@ -620,7 +620,7 @@
   "In WordStar mode: Go to marker 8."
   (interactive)
   (if ws-marker-8
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-8))
     (ws-error "Marker 8 not set")))
@@ -629,7 +629,7 @@
   "In WordStar mode: Go to marker 9."
   (interactive)
   (if ws-marker-9
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-marker-9))
     (ws-error "Marker 9 not set")))
@@ -638,7 +638,7 @@
   "In WordStar mode: Go to block begin marker."
   (interactive)
   (if ws-block-begin-marker
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-block-begin-marker))
     (ws-error "Block begin marker not set")))
@@ -665,7 +665,7 @@
   "In WordStar mode: Go to block end marker."
   (interactive)
   (if ws-block-end-marker
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-block-end-marker))
     (ws-error "Block end marker not set")))
@@ -680,7 +680,7 @@
   "In WordStar mode: "
   (interactive)
   (if ws-last-cursorposition
-      (let ()
+      (progn
        (setq ws-last-cursorposition (point-marker))
        (goto-char ws-last-cursorposition))
     (ws-error "No last cursor position available.")))
@@ -740,7 +740,7 @@
   "In WordStar mode: Copy block to current cursor position."
   (interactive)
   (if (and ws-block-begin-marker ws-block-end-marker)
-      (let ()
+      (progn
        (copy-region-as-kill ws-block-begin-marker ws-block-end-marker)
        (yank)
        (save-excursion