Fix some broken conditional forms

Problem reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2020-01/msg00088.html
* lisp/cedet/ede/cpp-root.el (ede-create-lots-of-projects-under-dir):
Remove this quick hack, which didn’t do anything anyway.
* lisp/cedet/ede/pconf.el (ede-proj-configure-test-required-file):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print-col):
* lisp/net/nsm.el (nsm-check-tls-connection):
Use ‘when’ rather than bypassing it.  This doesn’t affect behavior
and is better style.
* lisp/cedet/srecode/semantic.el (srecode-semantic-handle-:tag):
Fix typo that suppressed an error.
* lisp/filesets.el (filesets-run-cmd): Fix typo that mishandled spacing.
* lisp/gnus/gnus-cloud.el (gnus-cloud-update-newsrc-data):
Fix typo that caused “GROUP has older different info in the cloud
as of DATE, update it here?” prompt result to always be treated as
“yes”.
* lisp/gnus/mml-smime.el (mml-smime-openssl-encrypt): Simplify,
since smime-encrypt-buffer signals error on failure.
* lisp/international/titdic-cnv.el (tsang-quick-converter): Simplify.
The conversion of this file to utf-8-emacs in
2019-01-08T02:18:40Z!monnier@iro.umontreal.ca removed the
distinction between Big5 and CNS fulltitles in the generated docstring.
* lisp/org/org-agenda.el (org-agenda-show-and-scroll-up):
* lisp/textmodes/table.el (table--generate-source-cell-contents):
Simplify by removing useless code.
* lisp/org/ox-odt.el (org-odt--format-timestamp): Fix typo that
always output time-of-day even when the timestamp lacked it.

diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index ee8aa5db1b7d4bf6cdb2bad1f2dd8364e6b13f9b..f0dbccb7fc1da08c413571b93687d274023eab67 100644 (file)
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -478,21 +478,6 @@ Argument COMMAND is the command to use for compiling the target."
   "Don't rescan this project from the sources."
   (message "cpp-root has nothing to rescan."))
 
-;;; Quick Hack
-(defun ede-create-lots-of-projects-under-dir (dir projfile &rest attributes)
-  "Create a bunch of projects under directory DIR.
-PROJFILE is a file name sans directory that indicates a subdirectory
-is a project directory.
-Generic ATTRIBUTES, such as :include-path can be added.
-Note: This needs some work."
-  (let ((files (directory-files dir t)))
-    (dolist (F files)
-      (if (file-exists-p (expand-file-name projfile F))
-         `(ede-cpp-root-project (file-name-nondirectory F)
-                                :name (file-name-nondirectory F)
-                                :file (expand-file-name projfile F)
-                                attributes)))))
-
 (provide 'ede/cpp-root)
 
 ;; Local variables:

diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 63fb62b5a578e6a77d59108f4355fa2f40011392..b85b397af2db5d2197b1d0fb1d23668f02ddc46d 100644 (file)
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -56,8 +56,9 @@ don't do it.  A value of nil means to just do it.")
            (and (eq ede-pconf-create-file-query 'ask)
                 (not (eq ede-pconf-create-file-query 'never))
                 (not (y-or-n-p
-                      (format "I had to create the %s file for you.  Ok? " file)))
-                (error "Quit")))))))
+                      (format "I had to create the %s file for you.  Ok? "
+                              file))))
+         (error "Quit"))))))
 
 
 (cl-defmethod ede-proj-configure-synchronize ((this ede-proj-project))

diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 26c14892efd3ac0d6972c2b657b893446f23b4cf..5b2dd0347439500dd98379b30ca31466b2099e4d 100644 (file)
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -201,7 +201,7 @@ variable default values, and other things."
   (let ((tag (or srecode-semantic-selected-tag
                 (srecode-semantic-tag-from-kill-ring))))
     (when (not tag)
-      "No tag for current template.  Use the semantic kill-ring.")
+      (error "No tag for current template.  Use the semantic kill-ring."))
     (srecode-semantic-apply-tag-to-dict
      (srecode-semantic-tag (semantic-tag-name tag)
                           :prime tag)

diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 501cc3a29e05fde6bbcc4bd8c250742745e9ae41..b13f609f882f8166991692d9317ad5b7690c90a4 100644 (file)
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -547,10 +547,10 @@ Return the column number after insertion."
     ;; Don't truncate to `width' if the next column is align-right
     ;; and has some space left, truncate to `available-space' instead.
     (when (and not-last-col
-               (> label-width available-space)
-               (setq label (truncate-string-to-width
-                            label available-space nil nil t t)
-                     label-width available-space)))
+              (> label-width available-space))
+      (setq label (truncate-string-to-width
+                  label available-space nil nil t t)
+           label-width available-space))
     (setq label (bidi-string-mark-left-to-right label))
     (when (and right-align (> width label-width))
       (let ((shift (- width label-width)))

diff --git a/lisp/filesets.el b/lisp/filesets.el
index 9834bcf058715a25b0b01dd225c03186749da6d8..1ec0d24b5390a16b858238c3e06d06ef8bf50b3b 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1645,10 +1645,10 @@ Replace <file-name> or <<file-name>> with filename."
                                      (dolist (this args txt)
                                        (setq txt
                                              (concat txt
+                                                     (if (equal txt "") "" " ")
                                                      (filesets-run-cmd--repl-fn
                                                       this
                                                       (lambda (this)
-                                                        (if (equal txt "") "" " ")
                                                         (format "%s" this))))))))
                                   (cmd (concat fn " " args)))
                              (filesets-cmd-show-result

diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el
index cecfaef2f4ffc20e79d547150505c0e11b8024de..4d8764bacca5e9102fa28ad33c879362e2851c00 100644 (file)
--- a/lisp/gnus/gnus-cloud.el
+++ b/lisp/gnus/gnus-cloud.el
@@ -243,10 +243,10 @@ Use old data if FORCE-OLDER is not nil."
                 (when (or (not gnus-cloud-interactive)
                           (gnus-y-or-n-p
                            (format "%s has older different info in the cloud as of %s, update it here? "
-                                   group date))))
-                (gnus-message 2 "Installing cloud update of group %s" group)
-                (gnus-set-info group contents)
-                (gnus-group-update-group group)))
+                                  group date)))
+                 (gnus-message 2 "Installing cloud update of group %s" group)
+                 (gnus-set-info group contents)
+                 (gnus-group-update-group group))))
           (gnus-error 1 "Sorry, group %s is not subscribed" group))
       (gnus-error 1 "Sorry, could not update newsrc for group %s (invalid data %S)"
                   group elem))))

diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 3cc463d5d4c40c181c7d0ffb1893f1b6c2e99163..4754f37a2daead3756df85608d6ef312daf829aa 100644 (file)
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -154,14 +154,9 @@ Whether the passphrase is cached at all is controlled by
          (write-region (point-min) (point-max) file))
        (push file certfiles)
        (push file tmpfiles)))
-    (if (smime-encrypt-buffer certfiles)
-       (progn
-         (while (setq tmp (pop tmpfiles))
-           (delete-file tmp))
-         t)
-      (while (setq tmp (pop tmpfiles))
-       (delete-file tmp))
-      nil))
+    (smime-encrypt-buffer certfiles)
+    (while (setq tmp (pop tmpfiles))
+      (delete-file tmp)))
   (goto-char (point-max)))
 
 (defvar gnus-extract-address-components)

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 2a80d75fe7e34ad87923e47ed69b94d1dd47cd03..e95e399eda4b9b5c3c62fc78cb454e296244d1e3 100644 (file)
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -737,8 +737,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
 ;; method is for inputting CNS characters.
 
 (defun tsang-quick-converter (dicbuf tsang-p big5-p)
-  (let ((fulltitle (if tsang-p (if big5-p "倉頡" "倉頡")
-                    (if big5-p "簡易" "簡易")))
+  (let ((fulltitle (if tsang-p "倉頡" "簡易"))
        dic)
     (goto-char (point-max))
     (if big5-p

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index e94947bc7f1d80b5f5afd54249fd9330d6686f1b..1b0f04e5a197026830b1878a41a9493ba9ae9ee7 100644 (file)
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -311,9 +311,9 @@ See also: `network-security-protocol-checks' and `nsm-noninteractive'"
                                                   (map-values results)
                                                   "\n")
                                                  "\n")
-                                                "\n* ")))))
-                 (delete-process process)
-                 (setq process nil)))
+                                               "\n* "))))))
+       (delete-process process)
+       (setq process nil))
       (run-hook-with-args 'nsm-tls-post-check-functions
                           host port status settings results)))
   process)

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 4f89ea545009e7fbad620a8c0619b0be99423b2b..f45e47fb59a357a4560c344ad20d47ab8000a955 100644 (file)
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8981,7 +8981,6 @@ fold drawers."
         (narrow-to-region (org-entry-beginning-position)
                           (org-entry-end-position))
         (org-show-all '(drawers))))
-      (when arg )
       (setq org-agenda-show-window (selected-window)))
     (select-window win)))
 

diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 51cb42a49a558e254b5cfbce463dd30797ae4d99..a1486318a7d06eb39adbbc423f1d842773794051 100644 (file)
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -940,7 +940,7 @@ See `org-odt--build-date-styles' for implementation details."
         (has-time-p (or (not timestamp)
                         (org-timestamp-has-time-p timestamp)))
         (iso-date (let ((format (if has-time-p "%Y-%m-%dT%H:%M:%S"
-                                  "%Y-%m-%dT%H:%M:%S")))
+                                  "%Y-%m-%d")))
                     (funcall format-timestamp timestamp format end))))
     (if iso-date-p iso-date
       (let* ((style (if has-time-p "OrgDate2" "OrgDate1"))

diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 4482e7d4d23d388f097abf6204f1a9f4d387095d..a33e9266b4b2c875798a65c26be36bf3fce97e2f 100644 (file)
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -3206,11 +3206,7 @@ CALS (DocBook DTD):
          (while (and (re-search-forward "$" nil t)
                      (not (eobp)))
            (insert "<br />")
-           (forward-char 1)))
-       (unless (and table-html-delegate-spacing-to-user-agent
-                    (progn
-                      (goto-char (point-min))
-                      (looking-at "\\s *\\'")))))
+           (forward-char 1))))
        ((eq language 'cals)
        (table--remove-eol-spaces (point-min) (point-max))
        (if (re-search-forward "\\s +\\'" nil t)