Eliinado web-mode.

elpa/archives/gnu/archive-contents

@@ -18,13 +18,13 @@
 	 ("Leo Liu" . "sdl.web@gmail.com"))
 	(:keywords "tools" "processes" "convenience"))])
  (ada-mode .
-	   [(7 1 4)
+	   [(7 1 6)
 	    ((uniquify-files
 	      (1 0 1))
 	     (wisi
-	      (3 1 2))
+	      (3 1 3))
 	     (emacs
-	      (25 0)))
+	      (25 3)))
 	    "major-mode for editing Ada sources" tar
 	    ((:url . "http://www.nongnu.org/ada-mode/")
 	     (:maintainer "Stephen Leake" . "stephen_leake@stephe-leake.org")
@@ -74,17 +74,15 @@
 			  (:keywords "minibuffer" "completion")
 			  (:url . "https://elpa.gnu.org/packages/aggressive-completion.html"))])
  (aggressive-indent .
-		    [(1 8 3)
+		    [(1 10 0)
 		     ((emacs
-		       (24 1))
-		      (cl-lib
-		       (0 5)))
-		     "Minor mode to aggressively keep your code always indented" single
-		     ((:keywords "indent" "lisp" "maint" "tools")
+		       (24 3)))
+		     "Minor mode to aggressively keep your code always indented" tar
+		     ((:url . "https://github.com/Malabarba/aggressive-indent-mode")
+		      (:maintainer "Artur Malabarba" . "emacs@endlessparentheses.com")
 		      (:authors
 		       ("Artur Malabarba" . "emacs@endlessparentheses.com"))
-		      (:maintainer "Artur Malabarba" . "emacs@endlessparentheses.com")
-		      (:url . "https://github.com/Malabarba/aggressive-indent-mode"))])
+		      (:keywords "indent" "lisp" "maint" "tools"))])
  (ahungry-theme .
 		[(1 10 0)
 		 ((emacs
@@ -390,7 +388,7 @@
 			("Ingo Lohmar" . "i.lohmar@gmail.com"))
 		       (:keywords "abbrev" "convenience" "matching"))])
  (consult .
-	  [(0 8)
+	  [(0 9)
 	   ((emacs
 	     (26 1)))
 	   "Consulting completing-read" tar
@@ -409,7 +407,7 @@
 		      ("Jackson Ray Hamilton" . "jackson@jacksonrayhamilton.com"))
 		     (:keywords "convenience" "faces" "tools"))])
  (corfu .
-	[(0 8)
+	[(0 10)
 	 ((emacs
 	   (27 1)))
 	 "Completion Overlay Region FUnction" tar
@@ -480,7 +478,7 @@
 	      ("João Távora" . "joaotavora@gmail.com"))
 	     (:maintainer "João Távora" . "joaotavora@gmail.com"))])
  (dash .
-       [(2 18 1)
+       [(2 19 0)
 	((emacs
 	  (24)))
 	"A modern list library for Emacs" tar
@@ -524,11 +522,11 @@
 	    (:maintainer "Phil Sainty" . "psainty@orcon.net.nz")
 	    (:url . "https://savannah.nongnu.org/projects/delight"))])
  (devdocs .
-	  [(0 1)
+	  [(0 2)
 	   ((emacs
 	     (27 1)))
 	   "Emacs viewer for DevDocs" tar
-	   ((:url . "https://github.com/astoff/devdocs")
+	   ((:url . "https://github.com/astoff/devdocs.el")
 	    (:maintainer "Augusto Stoffel" . "arstoffel@gmail.com")
 	    (:authors
 	     ("Augusto Stoffel" . "arstoffel@gmail.com"))
@@ -648,7 +646,7 @@
 	       ("Leo Liu" . "sdl.web@gmail.com"))
 	      (:keywords "killing" "convenience"))])
  (ebdb .
-       [(0 6 23)
+       [(0 7)
 	((emacs
 	  (25 1))
 	 (cl-lib
@@ -692,7 +690,7 @@
 	      (:maintainer "Markus Triska" . "triska@metalevel.at")
 	      (:url . "https://www.metalevel.at/ediprolog/"))])
  (eev .
-      [(20210607)
+      [(20210710)
        ((emacs
 	 (24 4)))
        "Support for e-scripts (eepitch blocks, elisp hyperlinks, etc)" tar
@@ -768,7 +766,7 @@
 		     (:keywords "languages" "lisp")
 		     (:url . "https://elpa.gnu.org/packages/elisp-benchmarks.html"))])
  (emms .
-       [(7 2)
+       [(7 5)
 	((cl-lib
 	  (0 5))
 	 (nadvice
@@ -926,6 +924,16 @@
 	(:authors
 	 ("Magnus Henoch" . "magnus.henoch@gmail.com"))
 	(:maintainer "Thomas Fitzsimmons" . "fitzsim@fitzsim.org"))])
+ (ftable .
+	 [(1 0)
+	  ((emacs
+	    (26 0)))
+	  "Fill a table to fit in n columns" tar
+	  ((:url . "https://github.com/casouri/ftable")
+	   (:maintainer "Yuan Fu" . "casouri@gmail.com")
+	   (:authors
+	    ("Yuan Fu" . "casouri@gmail.com"))
+	   (:keywords "convenience" "text" "table"))])
  (gcmh .
        [(0 2 1)
 	((emacs
@@ -1209,7 +1217,7 @@
 	       ("Oleh Krehel" . "ohwoeowho@gmail.com"))
 	      (:keywords "convenience"))])
  (ivy-posframe .
-	       [(0 6 0)
+	       [(0 6 1)
 		((emacs
 		  (26 0))
 		 (posframe
@@ -1313,7 +1321,7 @@
 	      ("Terrence Brannon" . "metaperl@gmail.com"))
 	     (:maintainer nil . "emacs-devel@gnu.org"))])
  (leaf .
-       [(4 4 8)
+       [(4 5 2)
 	((emacs
 	  (24 1)))
 	"Simplify your init.el configuration, extended use-package" tar
@@ -1394,7 +1402,7 @@
 	(:keywords "extensions" "lisp")
 	(:url . "https://elpa.gnu.org/packages/map.html"))])
  (marginalia .
-	     [(0 6)
+	     [(0 7)
 	      ((emacs
 		(26 1)))
 	      "Enrich existing commands with completion annotations" tar
@@ -1494,7 +1502,7 @@
 			  ("Protesilaos Stavrou" . "info@protesilaos.com"))
 			 (:keywords "faces" "theme" "accessibility"))])
  (modus-themes .
-	       [(1 4 0)
+	       [(1 5 0)
 		((emacs
 		  (26 1)))
 		"Highly accessible themes (WCAG AAA)" tar
@@ -1786,7 +1794,7 @@
 	     ("Phillip Lord" . "phillip.lord@russet.org.uk"))
 	    (:url . "http://elpa.gnu.org/packages/persist.html"))])
  (phps-mode .
-	    [(0 4 3)
+	    [(0 4 4)
 	     ((emacs
 	       (26)))
 	     "Major mode for PHP with Semantic integration" tar
@@ -1812,7 +1820,7 @@
 	   ("Mario Lang" . "mlang@delysid.org"))
 	  (:maintainer "Mario Lang" . "mlang@delysid.org"))])
  (posframe .
-	   [(1 0 3)
+	   [(1 0 4)
 	    ((emacs
 	      (26)))
 	    "Pop a posframe (just a frame) at point" tar
@@ -1847,14 +1855,14 @@
 	       ("Scott Andrew Borton" . "scott@pp.htv.fi"))
 	      (:maintainer "John Darrington" . "john@darrington.wattle.id.au"))])
  (pyim .
-       [(3 7 9)
+       [(3 9 4)
 	((emacs
 	  (24 4))
 	 (async
 	  (1 6))
 	 (xr
 	  (1 13)))
-	"A Chinese input method support quanpin, shuangpin, wubi and cangjie." tar
+	"A Chinese input method support quanpin, shuangpin, wubi, cangjie and rime." tar
 	((:url . "https://github.com/tumashu/pyim")
 	 (:maintainer "Feng Shu" . "tumashu@163.com")
 	 (:authors
@@ -2151,14 +2159,14 @@
 	(:keywords "sequences")
 	(:url . "http://elpa.gnu.org/packages/seq.html"))])
  (setup .
-	[(0 2 0)
+	[(0 2 1)
 	 ((emacs
 	   (26 1)))
 	 "Helpful Configuration Macro" tar
 	 ((:url . "https://git.sr.ht/~zge/setup")
-	  (:maintainer "Philip K." . "philipk@posteo.net")
+	  (:maintainer "Philip Kaludercic" . "philipk@posteo.net")
 	  (:authors
-	   ("Philip K." . "philipk@posteo.net"))
+	   ("Philip Kaludercic" . "philipk@posteo.net"))
 	  (:keywords "lisp" "local"))])
  (shelisp .
 	  [(0 9 1)
@@ -2195,7 +2203,7 @@
 	      (:maintainer "Ralph Amissah" . "ralph.amissah@gmail.com")
 	      (:url . "http://www.sisudoc.org/"))])
  (slime-volleyball .
-		   [(1 1 7)
+		   [(1 2 0)
 		    ((cl-lib
 		      (0 5)))
 		    "An SVG Slime Volleyball Game" tar
@@ -2203,7 +2211,7 @@
 		     (:authors
 		      ("Thomas Fitzsimmons" . "fitzsim@fitzsim.org"))
 		     (:keywords "games")
-		     (:url . "http://elpa.gnu.org/packages/slime-volleyball.html"))])
+		     (:url . "https://elpa.gnu.org/packages/slime-volleyball.html"))])
  (sm-c-mode .
 	    [(1 1)
 	     nil "C major mode based on SMIE" single
@@ -2289,13 +2297,15 @@
 	    (:maintainer "Artur Malabarba" . "emacs@endlessparentheses.com")
 	    (:url . "https://github.com/Malabarba/speed-of-thought-lisp"))])
  (spinner .
-	  [(1 7 3)
-	   nil "Add spinners and progress-bars to the mode-line for ongoing operations" single
-	   ((:keywords "processes" "mode-line")
+	  [(1 7 4)
+	   ((emacs
+	     (24 3)))
+	   "Add spinners and progress-bars to the mode-line for ongoing operations" tar
+	   ((:url . "https://github.com/Malabarba/spinner.el")
+	    (:maintainer "Artur Malabarba" . "emacs@endlessparentheses.com")
 	    (:authors
 	     ("Artur Malabarba" . "emacs@endlessparentheses.com"))
-	    (:maintainer "Artur Malabarba" . "emacs@endlessparentheses.com")
-	    (:url . "https://github.com/Malabarba/spinner.el"))])
+	    (:keywords "processes" "mode-line"))])
  (sql-beeline .
 	      [(0 1)
 	       nil "Beeline support for sql.el" single
@@ -2305,7 +2315,7 @@
 		 ("Filipp Gunbin" . "fgunbin@fastmail.fm"))
 		(:maintainer "Filipp Gunbin" . "fgunbin@fastmail.fm"))])
  (sql-indent .
-	     [(1 5)
+	     [(1 6)
 	      ((cl-lib
 		(0 5)))
 	      "Support for indenting code in SQL files." tar
@@ -2315,7 +2325,7 @@
 		("Alex Harsanyi" . "AlexHarsanyi@gmail.com"))
 	       (:keywords "languages" "sql"))])
  (ssh-deploy .
-	     [(3 1 12)
+	     [(3 1 13)
 	      ((emacs
 		(25)))
 	      "Deployment via Tramp, global or per directory." tar
@@ -2428,7 +2438,7 @@
 	  ("Oleh Krehel" . "ohwoeowho@gmail.com"))
 	 (:keywords "convenience"))])
  (tramp .
-	[(2 5 0 5)
+	[(2 5 1 1)
 	 ((emacs
 	   (25 1)))
 	 "Transparent Remote Access, Multiple Protocol" tar
@@ -2455,7 +2465,7 @@
 		("David Gonzalez Gandara" . "dggandara@member.fsf.org"))
 	       (:maintainer "David Gonzalez Gandara" . "dggandara@member.fsf.org"))])
  (transient .
-	    [(0 3 4)
+	    [(0 3 6)
 	     ((emacs
 	       (25 1)))
 	     "Transient commands" tar
@@ -2535,6 +2545,16 @@
 	   (:authors
 	    ("Yuan Fu" . "casouri@gmail.com"))
 	   (:keywords "convenience" "text" "table"))])
+ (vc-hgcmd .
+	   [(1 14)
+	    ((emacs
+	      (25 1)))
+	    "VC mercurial backend that uses hg command server" tar
+	    ((:url . "https://github.com/muffinmad/emacs-vc-hgcmd")
+	     (:maintainer "Andrii Kolomoiets" . "andreyk.mad@gmail.com")
+	     (:authors
+	      ("Andrii Kolomoiets" . "andreyk.mad@gmail.com"))
+	     (:keywords "vc"))])
  (vcard .
 	[(0 2 1)
 	 ((emacs
@@ -2574,7 +2594,7 @@
 		  ("Wilson Snyder" . "wsnyder@wsnyder.org"))
 		 (:keywords "languages"))])
  (vertico .
-	  [(0 11)
+	  [(0 12)
 	   ((emacs
 	     (27 1)))
 	   "VERTical Interactive COmpletion" tar
@@ -2691,9 +2711,9 @@
 		("Bastien" . "bzg@gnu.org"))
 	       (:maintainer "Bastien" . "bzg@gnu.org"))])
  (wisi .
-       [(3 1 3)
+       [(3 1 5)
 	((emacs
-	  (25 0))
+	  (25 3))
 	 (seq
 	  (2 20)))
 	"Utilities for implementing an indentation/navigation engine using a generalized LALR parser" tar

elpa/archives/gnu/archive-contents.signed

@@ -1 +1 @@
-Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2021-06-07T05:05:02-0400 using RSA
+Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2021-08-03T05:05:02-0400 using RSA

elpa/php-mode-20210801.1818/php-face.el

@@ -30,7 +30,7 @@
 
 ;;;###autoload
 (defgroup php-faces nil
-  "Faces used in PHP Mode"
+  "Faces used in PHP Mode."
   :tag "PHP Faces"
   :group 'php-mode
   :group 'faces)
@@ -206,7 +206,7 @@
   :tag "PHP Class Declaration")
 
 (defface php-class-declaration-spec '((t (:inherit php-keyword)))
-  "PHP Mode Face used to highlight class declaration specification keywords (implements, extends)"
+  "PHP Mode Face used to highlight class declaration specification keywords (implements, extends)."
   :group 'php-faces
   :tag "PHP Class Declaration Specification")
 

elpa/php-mode-20210801.1818/php-mode-autoloads.el

@@ -12,16 +12,24 @@
 (let ((loads (get 'php 'custom-loads))) (if (member '"php" loads) nil (put 'php 'custom-loads (cons '"php" loads))))
 
 (autoload 'php-mode-maybe "php" "\
-Select PHP mode or other major mode." t nil)
+Select PHP mode or other major mode.
+
+\(fn)" t nil)
 
 (autoload 'php-current-class "php" "\
-Insert current class name if cursor in class context." t nil)
+Insert current class name if cursor in class context.
+
+\(fn)" t nil)
 
 (autoload 'php-current-namespace "php" "\
-Insert current namespace if cursor in namespace context." t nil)
+Insert current namespace if cursor in namespace context.
+
+\(fn)" t nil)
 
 (autoload 'php-copyit-fqsen "php" "\
-Copy/kill class/method FQSEN." t nil)
+Copy/kill class/method FQSEN.
+
+\(fn)" t nil)
 
 (autoload 'php-run-builtin-web-server "php" "\
 Run PHP Built-in web server.
@@ -48,16 +56,13 @@ Find php.ini FILE by `php --ini'.
 ;;; Generated autoloads from php-align.el
 
 (autoload 'php-align-setup "php-align" "\
-Setup alignment configuration for PHP code." nil nil)
+Setup alignment configuration for PHP code.
+
+\(fn)" nil nil)
 
 (autoload 'php-align-mode "php-align" "\
 Alignment lines for PHP script.
 
-If called interactively, enable Php-Align mode if ARG is
-positive, and disable it if ARG is zero or negative.  If called
-from Lisp, also enable the mode if ARG is omitted or nil, and
-toggle it if ARG is `toggle'; disable the mode otherwise.
-
 \(fn &optional ARG)" t nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "php-align" '("php-align-")))
@@ -223,10 +228,14 @@ Function name or path to server-start script.")
 (put 'php-project-server-start 'safe-local-variable #'(lambda (v) (or (functionp v) (php-project--eval-bootstrap-scripts v))))
 
 (autoload 'php-project-get-bootstrap-scripts "php-project" "\
-Return list of bootstrap script." nil nil)
+Return list of bootstrap script.
+
+\(fn)" nil nil)
 
 (autoload 'php-project-get-root-dir "php-project" "\
-Return path to current PHP project." nil nil)
+Return path to current PHP project.
+
+\(fn)" nil nil)
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "php-project" '("php-project-")))
 

elpa/php-mode-20210801.1818/php-mode-pkg.el

@@ -1,6 +1,6 @@
-(define-package "php-mode" "20210519.1728" "Major mode for editing PHP code"
+(define-package "php-mode" "20210801.1818" "Major mode for editing PHP code"
   '((emacs "25.2"))
-  :commit "9561a6c0a92a3d7c00e7e57972f42cb5be775898" :authors
+  :commit "8cd3f5d252accd60ece7a905c3fa79ae7f118c03" :authors
   '(("Eric James Michael Ritz"))
   :maintainer
   '("USAMI Kenta" . "tadsan@zonu.me")

elpa/php-mode-20210801.1818/php-mode.el

@@ -458,7 +458,7 @@ PHP does not have an C-like \"enum\" keyword."
   php (append (c-lang-const c-class-decl-kwds) '("function")))
 
 (c-lang-defconst c-modifier-kwds
-  php '("abstract" "const" "final" "static" "case"))
+  php '("abstract" "const" "final" "static" "case" "readonly"))
 
 (c-lang-defconst c-protection-kwds
   "Access protection label keywords in classes."
@@ -960,7 +960,7 @@ this ^ lineup"
        (0 (ignore (php--syntax-propertize-quotes-in-comment (match-beginning 0)))))))
 
   (defmacro php-build-propertize-function ()
-    `(syntax-propertize-rules ,@php-syntax-propertize-rules))
+    `(byte-compile (syntax-propertize-rules ,@php-syntax-propertize-rules)))
 
   (defalias 'php-syntax-propertize-function (php-build-propertize-function)))
 

elpa/php-mode-20210801.1818/php.el

@@ -220,11 +220,20 @@ it is the character that will terminate the string, or t if the string should be
 
 (defsubst php-in-poly-php-html-mode ()
   "Return T if current buffer is in `poly-html-mode'."
-  (and (boundp 'poly-php-html-mode)
-       (symbol-value 'poly-php-html-mode)))
+  (bound-and-true-p poly-php-html-mode))
 
 (defconst php-beginning-of-defun-regexp
-  "^\\s-*\\(?:\\(?:abstract\\|final\\|private\\|protected\\|public\\|static\\)\\s-+\\)*function\\s-+&?\\(\\(\\sw\\|\\s_\\)+\\)\\s-*("
+  (eval-when-compile
+    (rx bol
+        (* (syntax whitespace))
+        (* (or "abstract" "final" "private" "protected" "public" "static")
+           (+ (syntax whitespace)))
+        "function"
+        (+ (syntax whitespace))
+        (? "&" (* (syntax whitespace)))
+        (group (+ (or (syntax word) (syntax symbol))))
+        (* (syntax whitespace))
+        "("))
   "Regular expression for a PHP function.")
 
 (eval-when-compile

elpa/web-mode-20200826.1954/web-mode-autoloads.el

@@ -1,27 +0,0 @@
-;;; web-mode-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-
-(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))
-
-
-;;;### (autoloads nil "web-mode" "web-mode.el" (0 0 0 0))
-;;; Generated autoloads from web-mode.el
-
-(autoload 'web-mode "web-mode" "\
-Major mode for editing web templates.
-
-\(fn)" t nil)
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "web-mode" '("web-mode-")))
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; coding: utf-8
-;; End:
-;;; web-mode-autoloads.el ends here

elpa/web-mode-20200826.1954/web-mode-pkg.el

@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "web-mode" "20200826.1954" "major mode for editing web templates" '((emacs "23.1")) :commit "da53553fd4e876ac121994cc48e54ab54fa3ace7" :keywords '("languages") :authors '(("François-Xavier Bois <fxbois AT Google Mail Service>")) :maintainer '("François-Xavier Bois") :url "http://web-mode.org")

init.el

@@ -13,23 +13,26 @@
  ;; If there is more than one, they won't work right.
  '(ansi-color-names-vector
    ["#212121" "#CC5542" "#6aaf50" "#7d7c61" "#5180b3" "#DC8CC3" "#9b55c3" "#bdbdb3"])
- '(compilation-message-face 'default)
- '(custom-enabled-themes '(dracula))
+ '(compilation-message-face (quote default))
+ '(custom-enabled-themes (quote (dracula)))
  '(custom-safe-themes
-   '("24714e2cb4a9d6ec1335de295966906474fdb668429549416ed8636196cb1441" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "c7eb06356fd16a1f552cfc40d900fe7326ae17ae7578f0ef5ba1edd4fdd09e58" "f3ab34b145c3b2a0f3a570ddff8fabb92dafc7679ac19444c31058ac305275e1" "dcdd1471fde79899ae47152d090e3551b889edf4b46f00df36d653adc2bf550d" "3994b1c5c1f412c025bb71b2df5973a421c257afee5278684639c205d79d93ee" default))
+   (quote
+    ("24714e2cb4a9d6ec1335de295966906474fdb668429549416ed8636196cb1441" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "c7eb06356fd16a1f552cfc40d900fe7326ae17ae7578f0ef5ba1edd4fdd09e58" "f3ab34b145c3b2a0f3a570ddff8fabb92dafc7679ac19444c31058ac305275e1" "dcdd1471fde79899ae47152d090e3551b889edf4b46f00df36d653adc2bf550d" "3994b1c5c1f412c025bb71b2df5973a421c257afee5278684639c205d79d93ee" default)))
  '(fci-rule-color "#2e2e2e")
- '(highlight-changes-colors '("#FD5FF0" "#AE81FF"))
+ '(highlight-changes-colors (quote ("#FD5FF0" "#AE81FF")))
  '(highlight-tail-colors
-   '(("#3C3D37" . 0)
+   (quote
+    (("#3C3D37" . 0)
      ("#679A01" . 20)
      ("#4BBEAE" . 30)
      ("#1DB4D0" . 50)
      ("#9A8F21" . 60)
      ("#A75B00" . 70)
      ("#F309DF" . 85)
-     ("#3C3D37" . 100)))
+     ("#3C3D37" . 100))))
  '(hl-todo-keyword-faces
-   '(("TODO" . "#dc752f")
+   (quote
+    (("TODO" . "#dc752f")
      ("NEXT" . "#dc752f")
      ("THEM" . "#2d9574")
      ("PROG" . "#4f97d7")
@@ -43,17 +46,19 @@
      ("TEMP" . "#b1951d")
      ("FIXME" . "#dc752f")
      ("XXX+" . "#dc752f")
-     ("\\?\\?\\?+" . "#dc752f")))
+     ("\\?\\?\\?+" . "#dc752f"))))
  '(inhibit-startup-screen t)
  '(magit-diff-use-overlays nil)
  '(package-selected-packages
-   '(dumb-jump csharp-mode yaml-mode smooth-scrolling web-mode multi-web-mode spacemacs-theme flycheck ac-emmet markdown-preview-mode multiple-cursors git-gutter powerline ample-zen-theme monokai-theme dracula-theme auto-complete neotree all-the-icons spinner markdown-mode lv ht f dash-functional))
- '(pdf-view-midnight-colors '("#b2b2b2" . "#292b2e"))
+   (quote
+    (php-mode dumb-jump csharp-mode yaml-mode smooth-scrolling multi-web-mode spacemacs-theme flycheck ac-emmet markdown-preview-mode multiple-cursors git-gutter powerline ample-zen-theme monokai-theme dracula-theme auto-complete neotree all-the-icons spinner markdown-mode lv ht f dash-functional)))
+ '(pdf-view-midnight-colors (quote ("#b2b2b2" . "#292b2e")))
  '(pos-tip-background-color "#FFFACE")
  '(pos-tip-foreground-color "#272822")
  '(vc-annotate-background "#3b3b3b")
  '(vc-annotate-color-map
-   '((20 . "#dd5542")
+   (quote
+    ((20 . "#dd5542")
      (40 . "#CC5542")
      (60 . "#fb8512")
      (80 . "#baba36")
@@ -70,10 +75,11 @@
      (300 . "#528fd1")
      (320 . "#5180b3")
      (340 . "#6380b3")
-     (360 . "#DC8CC3")))
+     (360 . "#DC8CC3"))))
  '(vc-annotate-very-old-color "#DC8CC3")
  '(weechat-color-list
-   '(unspecified "#272822" "#3C3D37" "#F70057" "#F92672" "#86C30D" "#A6E22E" "#BEB244" "#E6DB74" "#40CAE4" "#66D9EF" "#FB35EA" "#FD5FF0" "#74DBCD" "#A1EFE4" "#F8F8F2" "#F8F8F0")))
+   (quote
+    (unspecified "#272822" "#3C3D37" "#F70057" "#F92672" "#86C30D" "#A6E22E" "#BEB244" "#E6DB74" "#40CAE4" "#66D9EF" "#FB35EA" "#FD5FF0" "#74DBCD" "#A1EFE4" "#F8F8F2" "#F8F8F0"))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -116,12 +122,6 @@
       css-indent-offset 2)
 (c-set-offset 'case-label 2)
 (c-set-offset 'statement-case-intro 2)
-(require 'web-mode)
-(setq web-mode-css-indent-offset 2
-      web-mode-code-indent-offset 2
-      web-mode-sql-indent-offset 2
-      web-mode-script-padding 2
-      web-mode-markup-indent-offset 2)
 (require 'php-mode)
 (add-hook 'php-mode-hook #'(lambda()
                              (php-enable-default-coding-style)
@@ -131,7 +131,9 @@
 
 ;Atajos de teclas
 (global-set-key (kbd "C-a") 'mark-whole-buffer); Seleccionar todo con CTRL+A.
-(global-set-key (kbd "C-h") 'replace-string); Buscar y reemplazar
+;(global-set-key (kbd "C-h") 'replace-string); Buscar y reemplazar
+(global-unset-key (kbd "C-z")) ; Quitar definición actual de CTRL + Z
+(global-set-key (kbd "C-z") 'undo); Definir como CTRL + Z como deshacer
 (global-set-key [f9] 'neotree-toggle) ;Abrir/Cerrar neotree.
 ;(global-set-key (kbd "C-<f9>") 'shell) ;Abrir terminal.
 ;Cursores múltiples
@@ -159,15 +161,6 @@
     (display-line-numbers-mode -1))
 (add-hook 'neo-after-create-hook 'my/disable-line-numbers)
 
-;Cambiar de major-mode en un archivo que tiene php, html, css y js a la vez según el fracmento de código donde pones el cursor.
-(require 'multi-web-mode)
-(setq mweb-default-major-mode 'web-mode)
-(setq mweb-tags '((php-mode "<\\?php\\|<\\? \\|<\\?=" "\\?>")
-                  (js-mode "<script +\\(type=\"text/javascript\"\\|language=\"javascript\"\\)[^>]*>" "</script>")
-                  (css-mode "<style +type=\"text/css\"[^>]*>" "</style>")))
-(setq mweb-filename-extensions '("php" "htm" "html"))
-;(multi-web-global-mode 1)
-
 ;Habilitar auto-complete-mode en html-mode.
 (add-hook 'html-mode-hook #'(lambda()
                              (auto-complete-mode)

readme.md

@@ -18,8 +18,9 @@ Y eso sería todo. Si eres muy nuevo, te recomiendo ver algún tuto básico de 5
 
 ## Consideraciones
 
- - Esta configuración está hecha a mi medida, usos y juicio, pero el init.el lo he procurado comentar bastante para que sea sencillo entenderlo y que lo edites a tu gusto.
  - Toda la configuración la he realizado en el archivo `init.el`.
+ - Esta configuración está hecha a mi medida, usos y juicio, pero el init.el lo he procurado comentar bastante para que sea sencillo entenderlo y que lo edites a tu gusto.
+ - Copiar, Cortar y pegar están como los tienes emacs por defecto (ATL+W, CTRL+W y CTRL+Y), si quieres cambiarlo, ve al archivo `init.el` y descomenta la línea 97 (`(cua-mode t)`) para usar CTRL+C, CTRL+X y CTRL+V en su lugar.
  - Con F9 puedes abrir y cerrar neotree (puedes cambiarlo en la configuración).
- - Igual hay otros atajos configurados por mi, como CTRL+A para seleccionar todo o CTRL+F9 para abrir una terminal. De todos modos es mejor que mires la configuración y personalices tus atajos como mejor veas.
+ - Igual hay otros atajos configurados por mi, como CTRL+A para seleccionar todo o CTRL+Z deshacer. De todos modos es mejor que mires la configuración y personalices tus atajos como mejor veas.
  - Por defecto he configurado que al presionar TAB se usen 2 espacios en su lugar para PHP y otros lenguajes (para mantener el mismo espaciado que en Atom o VSCode), aunque el PSR2 de php suele recomendar reemplazar TAB por 4 espacios (quizá esto si te interese cambiarlo).