Replace empty `let's with `progn'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0165677e7cc0d592f67273bd9212d3a5991e5a0e..da9f156ab2261dbd200f7578fe39b035087f1329 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-13  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <monnier@iro.umontreal.ca>
 
        * mail/sendmail.el (send-mail-function):

diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index ca90e0923f01579c316ac8e192f2126b06e45279..971c763693242fd2f828ecc49479c25d83ae8671 100644 (file)
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -226,7 +226,7 @@ Buffer B."
          ;;(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)

diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index ada28e38ba34c22a79338d3862c0c045a1e041cd..ffbe7043d8868380829ab673fd7bc57d77e5ee9c 100644 (file)
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -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 <nickel@cs.tu-berlin.de>
 ;; Version: 0.7
@@ -457,14 +457,14 @@ in ws-last-errormessage for recovery with C-q w."
   (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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 ws-last-errormessage for recovery with C-q w."
   "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 @@ sWith: " )
   "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

diff --git a/lisp/filesets.el b/lisp/filesets.el
index c15e0231f00342074588ec0803f9ec9062cff6a9..e287c1492022d8006f6c85df1e7431083f4d59d0 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1641,7 +1641,7 @@ Replace <file-name> or <<file-name>> with filename."
                    (let ((buffer (filesets-find-file this)))
                      (when buffer
                        (goto-char (point-min))
-                       (let ()
+                       (progn
                          (cond
                           ((stringp fn)
                            (let* ((args