[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 088bfcc: Move “Fix some broken conditional forms” to master
From: |
Paul Eggert |
Subject: |
emacs-27 088bfcc: Move “Fix some broken conditional forms” to master |
Date: |
Sun, 5 Jan 2020 14:50:51 -0500 (EST) |
branch: emacs-27
commit 088bfcc2d80eed44864147f3491eff69e4eb5cd8
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Move “Fix some broken conditional forms” to master
Revert 2020-01-04T19:17:12Z!address@hidden
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.
---
lisp/cedet/ede/cpp-root.el | 15 +++++++++++++++
lisp/cedet/ede/pconf.el | 5 ++---
lisp/cedet/srecode/semantic.el | 2 +-
lisp/emacs-lisp/tabulated-list.el | 8 ++++----
lisp/filesets.el | 2 +-
lisp/gnus/gnus-cloud.el | 8 ++++----
lisp/gnus/mml-smime.el | 11 ++++++++---
lisp/international/titdic-cnv.el | 3 ++-
lisp/net/nsm.el | 6 +++---
lisp/org/org-agenda.el | 1 +
lisp/org/ox-odt.el | 2 +-
lisp/textmodes/table.el | 6 +++++-
12 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index f0dbccb..ee8aa5d 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -478,6 +478,21 @@ 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 b85b397..63fb62b 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -56,9 +56,8 @@ 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 5b2dd03..26c1489 100644
--- 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)
- (error "No tag for current template. Use the semantic kill-ring."))
+ "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 b13f609..501cc3a 100644
--- 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 1ec0d24..9834bcf 100644
--- 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 4d8764b..cecfaef 100644
--- 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 4754f37..3cc463d5 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -154,9 +154,14 @@ Whether the passphrase is cached at all is controlled by
(write-region (point-min) (point-max) file))
(push file certfiles)
(push file tmpfiles)))
- (smime-encrypt-buffer certfiles)
- (while (setq tmp (pop tmpfiles))
- (delete-file tmp)))
+ (if (smime-encrypt-buffer certfiles)
+ (progn
+ (while (setq tmp (pop tmpfiles))
+ (delete-file tmp))
+ t)
+ (while (setq tmp (pop tmpfiles))
+ (delete-file tmp))
+ nil))
(goto-char (point-max)))
(defvar gnus-extract-address-components)
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index e95e399..2a80d75 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -737,7 +737,8 @@ 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 "倉頡" "簡易"))
+ (let ((fulltitle (if tsang-p (if big5-p "倉頡" "倉頡")
+ (if big5-p "簡易" "簡易")))
dic)
(goto-char (point-max))
(if big5-p
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 1b0f04e..e94947b 100644
--- 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 f45e47f..4f89ea5 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8981,6 +8981,7 @@ 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 a148631..51cb42a 100644
--- 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-%d")))
+ "%Y-%m-%dT%H:%M:%S")))
(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 a33e926..4482e7d 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -3206,7 +3206,11 @@ CALS (DocBook DTD):
(while (and (re-search-forward "$" nil t)
(not (eobp)))
(insert "<br />")
- (forward-char 1))))
+ (forward-char 1)))
+ (unless (and table-html-delegate-spacing-to-user-agent
+ (progn
+ (goto-char (point-min))
+ (looking-at "\\s *\\'")))))
((eq language 'cals)
(table--remove-eol-spaces (point-min) (point-max))
(if (re-search-forward "\\s +\\'" nil t)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 088bfcc: Move “Fix some broken conditional forms” to master,
Paul Eggert <=