aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorGlenn Morris2020-05-09 10:03:21 -0700
committerGlenn Morris2020-05-09 10:03:21 -0700
commit5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb (patch)
tree8e14f3cedc3fba87248f49c2e960f6bf3cfe2da7 /lisp/progmodes
parent196bc13b7bc5a29fa4d27e83d7cf0db4d99aa8b7 (diff)
parentbe0d1cac83d14596406571f9cb668031ec5675ac (diff)
downloademacs-5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb.tar.gz
emacs-5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb.zip
Merge from origin/emacs-27
be0d1cac83 (origin/emacs-27) Small fix for type of 'display-fill-colu... c5e5839776 Fix customization of 'display-fill-column-indicator-charac... d5c184aa3e Refer to fill column indicator Info node in some places. e13300ae50 Merge branch 'emacs-27' of git.sv.gnu.org:/srv/git/emacs i... 0bae57033f Fix GTK's Tool Bar menu radio buttons 4c98aa7ea5 Minor clarifications in NEWS a1cbd05f38 Improve documentation of 'with-suppressed-warnings'. 4a895c1b26 Fix a typo in a comment 2caf3e997e Improve documentation of Hi Lock mode 7081c1d66f Fix typos in the Emacs user manual 0385771e2f Fix references to Speedbar in VHDL mode a76cafea0d Fix handling of FROM = t and TO = t by 'window-text-pixel-... # Conflicts: # etc/NEWS # src/xdisp.c
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/vhdl-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 22c61586266..9cd84cf713b 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -14730,7 +14730,7 @@ if required."
14730 (speedbar-add-mode-functions-list 14730 (speedbar-add-mode-functions-list
14731 '("vhdl directory" 14731 '("vhdl directory"
14732 (speedbar-item-info . vhdl-speedbar-item-info) 14732 (speedbar-item-info . vhdl-speedbar-item-info)
14733 (speedbar-line-directory . speedbar-files-line-path))) 14733 (speedbar-line-directory . speedbar-files-line-directory)))
14734 (speedbar-add-mode-functions-list 14734 (speedbar-add-mode-functions-list
14735 '("vhdl project" 14735 '("vhdl project"
14736 (speedbar-item-info . vhdl-speedbar-item-info) 14736 (speedbar-item-info . vhdl-speedbar-item-info)