diff --git a/dot.gnu-emacs b/dot.gnu-emacs index a69bf7d..fe448d9 100644 --- a/dot.gnu-emacs +++ b/dot.gnu-emacs @@ -153,6 +153,14 @@ ;; (A few changes on ispell) (setq ispell-highlight-face 'underline);) ;; + ;; Geomtry and layout + ;; +; (setq initial-frame-alist +; '((vertical-scroll-bars . right) (height . 34) (width . 80))) +; (setq default-frame-alist +; '((vertical-scroll-bars . right) (height . 34) (width . 80))) + + ;; ;; Some fonts ;; ----------------------- (if (> emacs-major-version 20) (require 'xfonts)) @@ -200,7 +208,7 @@ (setq font-lock-support-mode '((latex-mode . fast-lock-mode) (t . jit-lock-mode)))) ((and (boundp 'lazy-lock-mode) (symbol-value 'lazy-lock-mode)) (setq font-lock-support-mode '((latex-mode . fast-lock-mode) (t . lazy-lock-mode))))) - (add-hook 'after-init-hook '(lambda () (global-font-lock-mode 1))) + (add-hook 'after-init-hook #'(lambda () (global-font-lock-mode 1))) ;; ;; Some dialog @@ -233,8 +241,8 @@ ; (sit-for 0) ; (make-frame-visible foo)) ; (accept-process-output)))) -;(add-hook 'server-switch-hook '(lambda () (server-make-window-visible))) -;(add-hook 'server-visit-hook '(lambda () (server-make-window-visible))) +;(add-hook 'server-switch-hook #'(lambda () (server-make-window-visible))) +;(add-hook 'server-visit-hook #'(lambda () (server-make-window-visible))) ;; Start it for popup ;(server-start) ;; @@ -256,7 +264,7 @@ (if (or (and (= emacs-major-version 19) (> emacs-minor-version 29)) (> emacs-major-version 19)) (add-hook 'gnus-select-group-hook - '(lambda () + #'(lambda () (setq-default gnus-auto-select-first nil) (setq-default gnus-auto-center-summary nil) (setq gnus-thread-sort-functions @@ -265,7 +273,7 @@ gnus-thread-sort-by-date gnus-thread-sort-by-score)))) (add-hook 'gnus-select-group-hook - '(lambda () + #'(lambda () (setq-default gnus-auto-select-first nil) (setq-default gnus-auto-center-summary nil) ;; First of all, sort by date. @@ -287,9 +295,9 @@ ) ;; highlighting, menus, and subscribing in GNUS (add-hook 'gnus-startup-hook - '(lambda () + #'(lambda () (setq gnus-subscribe-newsgroup-method - '(lambda (newsgroup) + #'(lambda (newsgroup) (gnus-subscribe-newsgroup newsgroup) (gnus-kill-newsgroup newsgroup))) (setq gnus-use-generic-from t) @@ -318,8 +326,9 @@ ;; ;; Common to all C modes ;; --------------------- +;(autoload 'hideshowvis-enable "hideshowvis" "Highlight foldable regions") ;(add-hook 'c-mode-common-hook -; '(lambda () (c-set-style "linux") +; #'(lambda () (c-set-style "linux") ; (c-set-offset 'case-label 4) ; (setq c-basic-offset 4))) @@ -332,7 +341,7 @@ ;; ----------- ;; Fill-column ist hier auf 78 Charakter gesetzt, nach Wunsch "andern! (setq-default fill-column 78) -(add-hook 'TeX-mode-hook '(lambda () (setq fill-column 78))) +(add-hook 'TeX-mode-hook #'(lambda () (setq fill-column 78))) ;; ;; AUC-TeX ;; ---------------------------- @@ -357,7 +366,7 @@ (progn (add-hook 'LaTeX-mode-hook 'turn-on-font-lock) (add-hook 'LaTeX-mode-hook 'LaTeX-math-mode) - (add-hook 'after-init-hook '(lambda () (load "auctex/font-latex" nil t))))))) + (add-hook 'after-init-hook #'(lambda () (load "auctex/font-latex" nil t))))))) )) ;; @@ -375,7 +384,7 @@ (defun TeX-dollarm () (interactive "*") (TeX-Inserting ?\\ "$" "$$")) (defun TeX-REVbbox () (interactive "*") (TeX-Inserting ?\\ "bbox{" "\\bbox{}")) (add-hook 'LaTeX-mode-hook - '(lambda () + #'(lambda () ;; Uncomment this for automatic bracket closing ;; Begin bracket closing ; (local-set-key "{" 'TeX-schweif) diff --git a/emacs.changes b/emacs.changes index 79e6ad0..54b8861 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Nov 19 14:16:04 UTC 2021 - Dr. Werner Fink + +- Get rid of the old dbus shell code in the emacs shell script + nowadays this should be not needed anymore + +------------------------------------------------------------------- +Fri Nov 19 11:56:17 UTC 2021 - Dr. Werner Fink + +- Make dbus code in emacs shell script failsafe + +------------------------------------------------------------------- +Fri Nov 19 10:54:09 UTC 2021 - Dr. Werner Fink + +- Enable the NO_AT_BRIDGE code + +------------------------------------------------------------------- +Mon Nov 15 13:07:51 UTC 2021 - Dr. Werner Fink + +- Again disable workaround with XLIB_SKIP_ARGB_VISUALS set (boo#1191517) +- Correct quoting of anonymous function calls + ------------------------------------------------------------------- Wed Sep 8 09:05:56 UTC 2021 - Dr. Werner Fink diff --git a/emacs.sh b/emacs.sh index 6315e98..954a3b1 100644 --- a/emacs.sh +++ b/emacs.sh @@ -29,9 +29,8 @@ if test "$EMACS_TOOLKIT" = gtk; then # Currently (2013/05/24) the parser of the GNOME libs # are broken that is it is not independent from locale LC_NUMERIC=POSIX - XLIB_SKIP_ARGB_VISUALS=1 GDK_RGBA=0 - export LC_NUMERIC XLIB_SKIP_ARGB_VISUALS GDK_RGBA + export LC_NUMERIC GDK_RGBA fi arg0=$0 argv=("$@") @@ -53,57 +52,11 @@ dbusdaemon=$(type -p dbus-daemon 2>/dev/null) # Now check for valid dbus, e.g. after su/sudo/slogin # if test -n "$dbusdaemon" ; then - # - # Currently (2013/05/24) the option --autolaunch for scanning for an - # already existing session is an internal option of dbus-launch(1). - # - if test -s /var/lib/dbus/machine-id ; then - read -t1 mid < /var/lib/dbus/machine-id - elif test -s /etc/machine-id ; then - read -t1 mid < /etc/machine-id - else - mid= - fi - if test -n "$DBUS_SESSION_BUS_ADDRESS" ; then - # Determine dbus identifier - for guid in ${DBUS_SESSION_BUS_ADDRESS//,/ } ; do - case "$guid" in - guid=*) break - esac - done - # Check if dbus-daemon is active - dpid= - for suid in "${HOME}/.dbus/session-bus/"${mid}* ; do - test -e "$suid" || break - grep -q $guid "$suid" || continue - dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' "$suid") - test /proc/${dpid#*=}/exe -ef $dbusdaemon && continue - unset DBUS_SESSION_BUS_ADDRESS - break - done - if test -z "$dpid" ; then - case ":$DBUS_SESSION_BUS_ADDRESS" in - *:path=/run/user/${UID}/bus*) ;; - *) unset DBUS_SESSION_BUS_ADDRESS - esac - fi - fi - # Find a valid dbus-daemon if active - if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then - for suid in "${HOME}/.dbus/session-bus/"${mid}* ; do - test -e "$suid" || break - dpid=$(grep -E '^DBUS_SESSION_BUS_PID=[[:digit:]]+' "$suid") - test /proc/${dpid#*=}/exe -ef $dbusdaemon || continue - dadd=$(grep -E '^DBUS_SESSION_BUS_ADDRESS=' "$suid") - DBUS_SESSION_BUS_ADDRESS=${dadd#*=} - export DBUS_SESSION_BUS_ADDRESS - done - if test -z "$DBUS_SESSION_BUS_ADDRESS" -a -S "${XDG_RUNTIME_DIR}/bus" ; then - DBUS_SESSION_BUS_ADDRESS="unix:path=${XDG_RUNTIME_DIR}/bus" - export DBUS_SESSION_BUS_ADDRESS - fi - fi - unset mid guid suid dadd + + # Standard on modern systems + : ${XDG_RUNTIME_DIR:=/run/user/${UID}} + export XDG_RUNTIME_DIR + # Oops ... no dbus-daemon then launch a new session if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then dbuslaunch=$(type -p dbus-launch 2>/dev/null) @@ -129,7 +82,7 @@ fi # # Disable AT bridge if not accessible # -if test -z "NO_AT_BRIDGE" ; then +if test -z "$NO_AT_BRIDGE" ; then gsettings=$(gsettings get org.gnome.desktop.interface toolkit-accessibility 2>/dev/null) if test -z "$gsettings" -o "$gsettings" = false ; then NO_AT_BRIDGE=1 diff --git a/site-lisp.tar.bz2 b/site-lisp.tar.bz2 index 0eb1be8..901fa2f 100644 --- a/site-lisp.tar.bz2 +++ b/site-lisp.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c3b2fea1937f7af8c667f3b4ff67572fac147dd661715c1fa1fc18bc631644e -size 51852 +oid sha256:7a45287ae18da87f29342f68d19b7aa45aa6c416d5c6bd852d29ca973e0eb33a +size 51767