aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2020-01-24 07:50:22 -0800
committerGlenn Morris2020-01-24 07:50:22 -0800
commit635e55e81240b40fe587e3e2e9fa97550a63203b (patch)
tree1aaa94548ad7045a921a44dbfcddae43ef425410 /lisp
parentd9385acac25ace1b41f34f120805ef14ccb93bd9 (diff)
parent92f080dda8892861be7c175dc57f71dee0909d82 (diff)
downloademacs-635e55e81240b40fe587e3e2e9fa97550a63203b.tar.gz
emacs-635e55e81240b40fe587e3e2e9fa97550a63203b.zip
Merge from origin/emacs-27
92f080dda8 Tab-bar related finishing touches. 224e8d1464 Make call_process call signal_after_change. This fixes bu... d02f2a793e * lisp/simple.el: Minor fixes to commentary. 196c42b8bf Fix a few typos 4f2b967795 Fix doc strings for image-dired rotation commands # Conflicts: # etc/NEWS
Diffstat (limited to 'lisp')
-rw-r--r--lisp/image-dired.el24
-rw-r--r--lisp/simple.el5
-rw-r--r--lisp/tab-bar.el17
-rw-r--r--lisp/tab-line.el2
4 files changed, 26 insertions, 22 deletions
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 7774b82d514..768e941490d 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -1980,20 +1980,12 @@ With prefix argument ARG, display image in its original size."
1980 (clear-image-cache thumb)))) 1980 (clear-image-cache thumb))))
1981 1981
1982(defun image-dired-rotate-thumbnail-left () 1982(defun image-dired-rotate-thumbnail-left ()
1983 "Rotate thumbnail left (counter clockwise) 90 degrees. 1983 "Rotate thumbnail left (counter clockwise) 90 degrees."
1984The result of the rotation is displayed in the image display area
1985and a confirmation is needed before the original image files is
1986overwritten. This confirmation can be turned off using
1987`image-dired-rotate-original-ask-before-overwrite'."
1988 (interactive) 1984 (interactive)
1989 (image-dired-rotate-thumbnail "270")) 1985 (image-dired-rotate-thumbnail "270"))
1990 1986
1991(defun image-dired-rotate-thumbnail-right () 1987(defun image-dired-rotate-thumbnail-right ()
1992 "Rotate thumbnail counter right (clockwise) 90 degrees. 1988 "Rotate thumbnail counter right (clockwise) 90 degrees."
1993The result of the rotation is displayed in the image display area
1994and a confirmation is needed before the original image files is
1995overwritten. This confirmation can be turned off using
1996`image-dired-rotate-original-ask-before-overwrite'."
1997 (interactive) 1989 (interactive)
1998 (image-dired-rotate-thumbnail "90")) 1990 (image-dired-rotate-thumbnail "90"))
1999 1991
@@ -2035,12 +2027,20 @@ overwritten. This confirmation can be turned off using
2035 (image-dired-display-image file)))))) 2027 (image-dired-display-image file))))))
2036 2028
2037(defun image-dired-rotate-original-left () 2029(defun image-dired-rotate-original-left ()
2038 "Rotate original image left (counter clockwise) 90 degrees." 2030 "Rotate original image left (counter clockwise) 90 degrees.
2031The result of the rotation is displayed in the image display area
2032and a confirmation is needed before the original image files is
2033overwritten. This confirmation can be turned off using
2034`image-dired-rotate-original-ask-before-overwrite'."
2039 (interactive) 2035 (interactive)
2040 (image-dired-rotate-original "270")) 2036 (image-dired-rotate-original "270"))
2041 2037
2042(defun image-dired-rotate-original-right () 2038(defun image-dired-rotate-original-right ()
2043 "Rotate original image right (clockwise) 90 degrees." 2039 "Rotate original image right (clockwise) 90 degrees.
2040The result of the rotation is displayed in the image display area
2041and a confirmation is needed before the original image files is
2042overwritten. This confirmation can be turned off using
2043`image-dired-rotate-original-ask-before-overwrite'."
2044 (interactive) 2044 (interactive)
2045 (image-dired-rotate-original "90")) 2045 (image-dired-rotate-original "90"))
2046 2046
diff --git a/lisp/simple.el b/lisp/simple.el
index 9bfd58f7d61..8be27745b1c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3507,10 +3507,9 @@ whose `car' is BUFFER."
3507 (let ((win (car (get-buffer-window-list buf))) 3507 (let ((win (car (get-buffer-window-list buf)))
3508 (pmax (with-current-buffer buf (point-max)))) 3508 (pmax (with-current-buffer buf (point-max))))
3509 3509
3510 ;; The first time we run a command in a fresh created buffer 3510 ;; The first time we run a command in a freshly created buffer
3511 ;; we have not saved positions yet; advance to `point-max', so that 3511 ;; we have not saved positions yet; advance to `point-max', so that
3512 ;; succesive commands knows the position where the new comman start. 3512 ;; successive commands know where to start.
3513 ;; (unless (and pos (memq sym '(save-point beg-last-out)))
3514 (unless (and pos (memq sym '(save-point beg-last-out end-last-out))) 3513 (unless (and pos (memq sym '(save-point beg-last-out end-last-out)))
3515 (setq pos pmax)) 3514 (setq pos pmax))
3516 ;; Set point in the window displaying buf, if any; otherwise 3515 ;; Set point in the window displaying buf, if any; otherwise
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index f70fb6baeee..eccab268dc9 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -360,19 +360,19 @@ to `tab-bar-tab-name-truncated'."
360 :group 'tab-bar 360 :group 'tab-bar
361 :version "27.1") 361 :version "27.1")
362 362
363(defvar tab-bar-tab-name-truncated-ellipsis 363(defvar tab-bar-tab-name-ellipsis
364 (if (char-displayable-p ?…) "…" "...")) 364 (if (char-displayable-p ?…) "…" "..."))
365 365
366(defun tab-bar-tab-name-truncated () 366(defun tab-bar-tab-name-truncated ()
367 "Generate tab name from the buffer of the selected window. 367 "Generate tab name from the buffer of the selected window.
368Truncate it to the length specified by `tab-bar-tab-name-truncated-max'. 368Truncate it to the length specified by `tab-bar-tab-name-truncated-max'.
369Append ellipsis `tab-bar-tab-name-truncated-ellipsis' in this case." 369Append ellipsis `tab-bar-tab-name-ellipsis' in this case."
370 (let ((tab-name (buffer-name (window-buffer (minibuffer-selected-window))))) 370 (let ((tab-name (buffer-name (window-buffer (minibuffer-selected-window)))))
371 (if (< (length tab-name) tab-bar-tab-name-truncated-max) 371 (if (< (length tab-name) tab-bar-tab-name-truncated-max)
372 tab-name 372 tab-name
373 (propertize (truncate-string-to-width 373 (propertize (truncate-string-to-width
374 tab-name tab-bar-tab-name-truncated-max nil nil 374 tab-name tab-bar-tab-name-truncated-max nil nil
375 tab-bar-tab-name-truncated-ellipsis) 375 tab-bar-tab-name-ellipsis)
376 'help-echo tab-name)))) 376 'help-echo tab-name))))
377 377
378 378
@@ -722,11 +722,14 @@ Interactively, ARG selects the ARGth different frame to move to."
722If `leftmost', create as the first tab. 722If `leftmost', create as the first tab.
723If `left', create to the left from the current tab. 723If `left', create to the left from the current tab.
724If `right', create to the right from the current tab. 724If `right', create to the right from the current tab.
725If `rightmost', create as the last tab." 725If `rightmost', create as the last tab.
726If the value is a function, it should return a number as a position
727on the tab bar specifying where to insert a new tab."
726 :type '(choice (const :tag "First tab" leftmost) 728 :type '(choice (const :tag "First tab" leftmost)
727 (const :tag "To the left" left) 729 (const :tag "To the left" left)
728 (const :tag "To the right" right) 730 (const :tag "To the right" right)
729 (const :tag "Last tab" rightmost)) 731 (const :tag "Last tab" rightmost)
732 (function :tag "Function"))
730 :group 'tab-bar 733 :group 'tab-bar
731 :version "27.1") 734 :version "27.1")
732 735
@@ -773,7 +776,9 @@ After the tab is created, the hooks in
773 ('leftmost 0) 776 ('leftmost 0)
774 ('rightmost (length tabs)) 777 ('rightmost (length tabs))
775 ('left (1- (or from-index 1))) 778 ('left (1- (or from-index 1)))
776 ('right (1+ (or from-index 0))))))) 779 ('right (1+ (or from-index 0)))
780 ((pred functionp)
781 (funcall tab-bar-new-tab-to))))))
777 (setq to-index (max 0 (min (or to-index 0) (length tabs)))) 782 (setq to-index (max 0 (min (or to-index 0) (length tabs))))
778 (cl-pushnew to-tab (nthcdr to-index tabs)) 783 (cl-pushnew to-tab (nthcdr to-index tabs))
779 784
diff --git a/lisp/tab-line.el b/lisp/tab-line.el
index ad4050fec59..149fe8289c4 100644
--- a/lisp/tab-line.el
+++ b/lisp/tab-line.el
@@ -709,7 +709,7 @@ from the tab line."
709 (set-window-prev-buffers nil (assq-delete-all buffer (window-prev-buffers))) 709 (set-window-prev-buffers nil (assq-delete-all buffer (window-prev-buffers)))
710 (set-window-next-buffers nil (delq buffer (window-next-buffers))))) 710 (set-window-next-buffers nil (delq buffer (window-next-buffers)))))
711 ((functionp tab-line-close-tab-function) 711 ((functionp tab-line-close-tab-function)
712 (funcall tab-line-close-tab-function))) 712 (funcall tab-line-close-tab-function tab)))
713 (force-mode-line-update)))) 713 (force-mode-line-update))))
714 714
715 715