Remove unused code and reformat to 70 columns.feature/tabs

3 files changed, 2 insertions, 5 deletions

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index d5d5c6a826c..e61c1954a1f 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -591,7 +591,6 @@ since it could result in memory overflow and make Emacs crash."
 		      (const :tag "Text-image-horiz" :value text-image-horiz)
 		      (const :tag "System default" :value nil)) "24.1")
              (tool-bar-max-label-size frames integer "24.1")
-             (tab-bar-max-label-size frames integer "27.1")
 	     (auto-hscroll-mode scrolling
                                 (choice
                                  (const :tag "Don't scroll automatically"
diff --git a/lisp/startup.el b/lisp/startup.el
index 2ab4a3ae789..c0d6024cfab 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -731,9 +731,7 @@ It is the default value of the variable `top-level'."
     ("--background-color" . "-bg")
     ("--color"		  . "-color")))
 
-(defconst tab-bar-images-pixel-height 18
-  "Height in pixels of images in the tab-bar.")
-
+;; FIXME: this var unused?
 (defconst tool-bar-images-pixel-height 24
   "Height in pixels of images in the tool-bar.")
 
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 3108c595e94..42d40a96543 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -488,7 +488,7 @@ specified by `tab-bar-close-tab-select'."
   (unless tab-bar-mode
     (message "Added new tab with the current window configuration")))
 
-(defun tab-delete ()
+(defun tab-close ()
   "Delete the current window configuration without clicking a close button."
   (interactive)
   (tab-bar-close-current-tab)