gentoo resync : 25.08.2020

2 files changed, 27 insertions, 0 deletions

diff --git a/app-emacs/vterm/files/50vterm-gentoo.el b/app-emacs/vterm/files/50vterm-gentoo.el
new file mode 100644
index 000000000000..b3e234eba1cb
--- /dev/null
+++ b/app-emacs/vterm/files/50vterm-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@EMACSMODULES@")
+(autoload 'vterm "vterm" "Create a new vterm." t)
+(autoload 'vterm-other-window "vterm"
+  "Create a new vterm in another window." t)
diff --git a/app-emacs/vterm/files/vterm-dont-compile.patch b/app-emacs/vterm/files/vterm-dont-compile.patch
new file mode 100644
index 000000000000..6b08ae812360
--- /dev/null
+++ b/app-emacs/vterm/files/vterm-dont-compile.patch
@@ -0,0 +1,22 @@
+Simply error out if the module is not found. Don't confuse the user
+with messages about compiling the module, which won't work outside of
+the package's source tree.
+
+--- a/vterm.el
++++ b/vterm.el
+@@ -121,14 +121,7 @@
+           (message "Compilation of `emacs-libvterm' module succeeded")
+         (error "Compilation of `emacs-libvterm' module failed!")))))
+ 
+-;; If the vterm-module is not compiled yet, compile it
+-(unless (require 'vterm-module nil t)
+-  (if (or vterm-always-compile-module
+-            (y-or-n-p "Vterm needs `vterm-module' to work.  Compile it now? "))
+-      (progn
+-        (vterm-module-compile)
+-        (require 'vterm-module))
+-    (error "Vterm will not work until `vterm-module' is compiled!")))
++(require 'vterm-module)
+ 
+ ;; Silence compiler warnings by informing it of what functions are defined
+ (declare-function display-line-numbers-update-width "display-line-numbers")