From f7c1738793643a21917c9fb895d0e91da5446325 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Wed, 13 Feb 2019 13:54:17 +0100 Subject: Update php-mode --- .emacs.d/lisp/php-mode.el | 15 +++++++++------ .emacs.d/lisp/php-project.el | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.emacs.d/lisp/php-mode.el b/.emacs.d/lisp/php-mode.el index 79bf356..364937f 100644 --- a/.emacs.d/lisp/php-mode.el +++ b/.emacs.d/lisp/php-mode.el @@ -1,6 +1,6 @@ ;;; php-mode.el --- Major mode for editing PHP code -;; Copyright (C) 2018 Friends of Emacs-PHP development +;; Copyright (C) 2018-2019 Friends of Emacs-PHP development ;; Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad ;; 2008 Aaron S. Hawley ;; 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael Ritz @@ -9,14 +9,14 @@ ;; Maintainer: USAMI Kenta ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: languages php -;; Version: 1.20.0 +;; Version: 1.21.0 ;; Package-Requires: ((emacs "24.3") (cl-lib "0.5")) ;; License: GPL-3.0-or-later -(defconst php-mode-version-number "1.20.0" +(defconst php-mode-version-number "1.21.0" "PHP Mode version number.") -(defconst php-mode-modified "2018-12-05" +(defconst php-mode-modified "2019-01-09" "PHP Mode build date.") ;; This file is free software; you can redistribute it and/or @@ -418,7 +418,8 @@ This function may interfere with other hooks and other behaviors. In that case set to `NIL'." :type 'boolean) -(defcustom php-mode-disable-parent-mode-hooks t +(define-obsolete-variable-alias 'php-mode-disable-parent-mode-hooks 'php-mode-disable-c-mode-hook "1.21.0") +(defcustom php-mode-disable-c-mode-hook t "When set to `T', do not run hooks of parent modes (`java-mode', `c-mode')." :type 'boolean :group 'php-mode) @@ -1263,7 +1264,9 @@ After setting the stylevars run hooks according to STYLENAME "Major mode for editing PHP code. \\{php-mode-map}" - (when php-mode-disable-parent-mode-hooks + ;; :after-hook (c-update-modeline) + ;; (setq abbrev-mode t) + (when php-mode-disable-c-mode-hook (setq-local c-mode-hook nil) (setq-local java-mode-hook nil)) (c-initialize-cc-mode t) diff --git a/.emacs.d/lisp/php-project.el b/.emacs.d/lisp/php-project.el index bbcc19c..a2aa253 100644 --- a/.emacs.d/lisp/php-project.el +++ b/.emacs.d/lisp/php-project.el @@ -1,11 +1,11 @@ ;;; php-project.el --- Project support for PHP application -*- lexical-binding: t; -*- -;; Copyright (C) 2018 Friends of Emacs-PHP development +;; Copyright (C) 2018-2019 Friends of Emacs-PHP development ;; Author: USAMI Kenta ;; Keywords: tools, files ;; URL: https://github.com/emacs-php/php-mode -;; Version: 1.20.0 +;; Version: 1.21.0 ;; Package-Requires: ((emacs "24.3") (cl-lib "0.5")) ;; License: GPL-3.0-or-later -- cgit v1.3