aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
authorPaul Eggert2020-01-04 11:17:12 -0800
committerPaul Eggert2020-01-04 11:18:13 -0800
commitf95a2b83014a810d508448473b20186d55485efd (patch)
treea3105cbaae99ee1142db93d718cbc814eea56a28 /lisp/org
parent28727444f1c12f0b5f1fffa4cfa66032f8f16c2d (diff)
downloademacs-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/org')
-rw-r--r--lisp/org/org-agenda.el1
-rw-r--r--lisp/org/ox-odt.el2
2 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 4f89ea54500..f45e47fb59a 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -8981,7 +8981,6 @@ fold drawers."
8981 (narrow-to-region (org-entry-beginning-position) 8981 (narrow-to-region (org-entry-beginning-position)
8982 (org-entry-end-position)) 8982 (org-entry-end-position))
8983 (org-show-all '(drawers)))) 8983 (org-show-all '(drawers))))
8984 (when arg )
8985 (setq org-agenda-show-window (selected-window))) 8984 (setq org-agenda-show-window (selected-window)))
8986 (select-window win))) 8985 (select-window win)))
8987 8986
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 51cb42a49a5..a1486318a7d 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."
940 (has-time-p (or (not timestamp) 940 (has-time-p (or (not timestamp)
941 (org-timestamp-has-time-p timestamp))) 941 (org-timestamp-has-time-p timestamp)))
942 (iso-date (let ((format (if has-time-p "%Y-%m-%dT%H:%M:%S" 942 (iso-date (let ((format (if has-time-p "%Y-%m-%dT%H:%M:%S"
943 "%Y-%m-%dT%H:%M:%S"))) 943 "%Y-%m-%d")))
944 (funcall format-timestamp timestamp format end)))) 944 (funcall format-timestamp timestamp format end))))
945 (if iso-date-p iso-date 945 (if iso-date-p iso-date
946 (let* ((style (if has-time-p "OrgDate2" "OrgDate1")) 946 (let* ((style (if has-time-p "OrgDate2" "OrgDate1"))