Zander671/emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some stuff from the last commit

Browse Source
This commit is contained in:
Alexander Rosenberg
2024-10-05 02:55:22 -07:00
parent 93ed2b9e39
commit 046ba351ce
1 changed files with 67 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
init.el
View File

@ -919,79 +919,77 @@ COMMAND and COMINT are like `compile'."
(regexp-opt '("gschema" "gresource" "ui")) "\\'") . nxml-mode))) (regexp-opt '("gschema" "gresource" "ui")) "\\'") . nxml-mode)))
;; Bibtex (built in) ;; Bibtex (built in)
(use-package bibtex (require 'bibtex)
:ensure nil (defun my/bibtex-in-entry-p (&optional exclude-braces)
:defer nil "Return t is point is inside a BibTeX entry.
:config
(defun my/bibtex-in-entry-p (&optional exclude-braces)
"Return t is point is inside a BibTeX entry.
When EXCLUDE-BRACES is non-nil, don't count the first and last brace of the When EXCLUDE-BRACES is non-nil, don't count the first and last brace of the
entry as in the entry. That is, if the point is on the first { or last } of the entry as in the entry. That is, if the point is on the first { or last } of the
entry, return nil." entry, return nil."
(save-excursion (save-excursion
;; go to top level and check if the character at point is { (when (and exclude-braces (= ?\} (char-after)))
(when (and (not exclude-braces) (= ?{ (char-after))) (forward-char))
(forward-char)) ;; go to top level and check if the character at point is {
(let ((start-pos (point)) (let ((start-pos (point))
(last-valid (point))) (last-valid (point)))
(condition-case _ (condition-case _
(while t (while t
(up-list 1 t t) (backward-up-list 1 t t)
(setq last-valid (point))) (setq last-valid (point)))
(error (error
(and (and
(= ?\} (char-before last-valid)) (= ?\{ (char-after last-valid))
;; up-point moves to the char after the last brace, so if the point ;; up-point moves to the char after the last brace, so if the point
;; started there, we aren't in the entry ;; started there, we aren't in the entry
(not (= start-pos last-valid)) (or (not exclude-braces)
(or (not exclude-braces) (not (= start-pos last-valid)))))))))
(not (= start-pos (1- last-valid)))))))))) (defvar my/bibtex-indent-width 4
(defvar my/bibtex-indent-width 4 "Width to indent for `my/bibtex-calculate-indentation'.")
"Width to indent for `my/bibtex-calculate-indentation'.") (defun my/bibtex-calculate-indentation ()
(defun my/bibtex-calculate-indentation () "Calculate the column to indent to on the current line."
"Calculate the column to indent to on the current line." (save-excursion
(save-excursion (back-to-indentation)
(back-to-indentation) (if (my/bibtex-in-entry-p t)
(if (my/bibtex-in-entry-p t) my/bibtex-indent-width
my/bibtex-indent-width 0)))
0))) (defun my/bibtex-empty-line-p ()
(defun my/bibtex-empty-line-p () "Return t if the current line is only blank characters."
"Return t if the current line is only blank characters." (save-excursion
(save-excursion (beginning-of-line)
(beginning-of-line) (looking-at (rx (* blank) eol))))
(looking-at (rx (* blank) eol)))) (defun my/bibtex-indent-line ()
(defun my/bibtex-indent-line () "Indent the current line."
"Indent the current line." (interactive)
(interactive) (save-excursion
(save-excursion (beginning-of-line)
(beginning-of-line) (when (looking-at (rx (+ blank)))
(when (my/bibtex-empty-line-p) (delete-region (point) (match-end 0)))
(delete-region (point) (match-end 0))) (indent-to (my/bibtex-calculate-indentation)))
(indent-to (my/bibtex-calculate-indentation))) (when (looking-at (rx (+ blank) eol))
(when (looking-at (rx (+ blank) eol)) (end-of-line)))
(end-of-line))) (defun my/bibtex-indent-or-find-text ()
(defun my/bibtex-indent-or-find-text () "Either indent the current line or jump to the current fields text.
"Either indent the current line or jump to the current fields text.
If the current line is only whitespace call `my/bibtex-calculate-indentation', If the current line is only whitespace call `my/bibtex-calculate-indentation',
otherwise, call `bibtex-find-text'." otherwise, call `bibtex-find-text'."
(interactive) (interactive)
(if (my/bibtex-empty-line-p) (if (my/bibtex-empty-line-p)
(my/bibtex-indent-line) (my/bibtex-indent-line)
(bibtex-find-text))) (bibtex-find-text)))
(defun my/bibtex-indent-or-find-text-and-insert () (defun my/bibtex-indent-or-find-text-and-insert ()
"Like `my/bibtex-indent-or-find-text', but enter insert mode after." "Like `my/bibtex-indent-or-find-text', but enter insert mode after."
(interactive) (interactive)
(my/bibtex-indent-or-find-text) (my/bibtex-indent-or-find-text)
(if (my/bibtex-empty-line-p) (if (my/bibtex-empty-line-p)
(evil-append 1) (evil-append 1)
(evil-insert 1))) (evil-insert 1)))
(defun my/-bibtex-setup-indent () (defun my/-bibtex-setup-indent ()
(setq-local indent-line-function 'my/bibtex-indent-line)) "Set up `bibtex-mode' indentation stuff."
(add-hook 'bibtex-mode-hook 'my/-bibtex-setup-indent) (setq-local indent-line-function 'my/bibtex-indent-line
(define-key bibtex-mode-map (kbd "RET") 'newline-and-indent) electric-indent-chars '(?\n ?\{ ?\} ?,)))
(define-key bibtex-mode-map (kbd "TAB") 'my/bibtex-indent-or-find-text) (add-hook 'bibtex-mode-hook 'my/-bibtex-setup-indent)
(evil-define-key 'normal bibtex-mode-map (define-key bibtex-mode-map (kbd "RET") 'newline-and-indent)
(kbd "TAB") 'my/bibtex-indent-or-find-text-and-insert)) (define-key bibtex-mode-map (kbd "TAB") 'my/bibtex-indent-or-find-text)
(evil-define-key 'normal bibtex-mode-map
(kbd "TAB") 'my/bibtex-indent-or-find-text-and-insert)
;; AUCTeX ;; AUCTeX
(use-package auctex (use-package auctex