diff options
| author | Paul Eggert | 2020-01-04 11:17:12 -0800 |
|---|---|---|
| committer | Paul Eggert | 2020-01-04 11:18:13 -0800 |
| commit | f95a2b83014a810d508448473b20186d55485efd (patch) | |
| tree | a3105cbaae99ee1142db93d718cbc814eea56a28 /lisp/cedet | |
| parent | 28727444f1c12f0b5f1fffa4cfa66032f8f16c2d (diff) | |
| download | emacs-f95a2b83014a810d508448473b20186d55485efd.tar.gz emacs-f95a2b83014a810d508448473b20186d55485efd.zip | |
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.
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/ede/cpp-root.el | 15 | ||||
| -rw-r--r-- | lisp/cedet/ede/pconf.el | 5 | ||||
| -rw-r--r-- | lisp/cedet/srecode/semantic.el | 2 |
3 files changed, 4 insertions, 18 deletions
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index ee8aa5db1b7..f0dbccb7fc1 100644 --- 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." | |||
| 478 | "Don't rescan this project from the sources." | 478 | "Don't rescan this project from the sources." |
| 479 | (message "cpp-root has nothing to rescan.")) | 479 | (message "cpp-root has nothing to rescan.")) |
| 480 | 480 | ||
| 481 | ;;; Quick Hack | ||
| 482 | (defun ede-create-lots-of-projects-under-dir (dir projfile &rest attributes) | ||
| 483 | "Create a bunch of projects under directory DIR. | ||
| 484 | PROJFILE is a file name sans directory that indicates a subdirectory | ||
| 485 | is a project directory. | ||
| 486 | Generic ATTRIBUTES, such as :include-path can be added. | ||
| 487 | Note: This needs some work." | ||
| 488 | (let ((files (directory-files dir t))) | ||
| 489 | (dolist (F files) | ||
| 490 | (if (file-exists-p (expand-file-name projfile F)) | ||
| 491 | `(ede-cpp-root-project (file-name-nondirectory F) | ||
| 492 | :name (file-name-nondirectory F) | ||
| 493 | :file (expand-file-name projfile F) | ||
| 494 | attributes))))) | ||
| 495 | |||
| 496 | (provide 'ede/cpp-root) | 481 | (provide 'ede/cpp-root) |
| 497 | 482 | ||
| 498 | ;; Local variables: | 483 | ;; Local variables: |
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el index 63fb62b5a57..b85b397af2d 100644 --- 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.") | |||
| 56 | (and (eq ede-pconf-create-file-query 'ask) | 56 | (and (eq ede-pconf-create-file-query 'ask) |
| 57 | (not (eq ede-pconf-create-file-query 'never)) | 57 | (not (eq ede-pconf-create-file-query 'never)) |
| 58 | (not (y-or-n-p | 58 | (not (y-or-n-p |
| 59 | (format "I had to create the %s file for you. Ok? " file))) | 59 | (format "I had to create the %s file for you. Ok? " |
| 60 | (error "Quit"))))))) | 60 | file)))) |
| 61 | (error "Quit")))))) | ||
| 61 | 62 | ||
| 62 | 63 | ||
| 63 | (cl-defmethod ede-proj-configure-synchronize ((this ede-proj-project)) | 64 | (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 26c14892efd..5b2dd034743 100644 --- a/lisp/cedet/srecode/semantic.el +++ b/lisp/cedet/srecode/semantic.el | |||
| @@ -201,7 +201,7 @@ variable default values, and other things." | |||
| 201 | (let ((tag (or srecode-semantic-selected-tag | 201 | (let ((tag (or srecode-semantic-selected-tag |
| 202 | (srecode-semantic-tag-from-kill-ring)))) | 202 | (srecode-semantic-tag-from-kill-ring)))) |
| 203 | (when (not tag) | 203 | (when (not tag) |
| 204 | "No tag for current template. Use the semantic kill-ring.") | 204 | (error "No tag for current template. Use the semantic kill-ring.")) |
| 205 | (srecode-semantic-apply-tag-to-dict | 205 | (srecode-semantic-apply-tag-to-dict |
| 206 | (srecode-semantic-tag (semantic-tag-name tag) | 206 | (srecode-semantic-tag (semantic-tag-name tag) |
| 207 | :prime tag) | 207 | :prime tag) |