branch: scratch/editorconfig-cc
commit bba8ddfa9bce733ad4e6910b789d839942636ad2
Author: 10sr <8.slas...@gmail.com>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>

    Rename existing function set-major-mode -> set-major-mode-from-name
---
 editorconfig.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editorconfig.el b/editorconfig.el
index c87e730af9..f30b0ee75f 100644
--- a/editorconfig.el
+++ b/editorconfig.el
@@ -314,7 +314,7 @@ number - `lisp-indent-offset' is not set only if 
indent_size is
         (and parent
              (editorconfig--is-a-mode-p parent want)))))
 
-(defun editorconfig-set-major-mode (filetype)
+(defun editorconfig-set-major-mode-from-name (filetype)
   "Set buffer `major-mode' by FILETYPE.
 
 FILETYPE should be s string like `\"ini\"`, if not nil or empty string."
@@ -460,7 +460,7 @@ applies available properties."
                (gethash 'end_of_line props)
                (gethash 'charset props))
               (editorconfig-set-line-length (gethash 'max_line_length props))
-              (editorconfig-set-major-mode (gethash 'file_type_emacs props))
+              (editorconfig-set-major-mode-from-name (gethash 'file_type_emacs 
props))
               (editorconfig-set-major-mode-from-ext (gethash 'file_type_ext 
props))
               (condition-case err
                   (run-hook-with-args 'editorconfig-custom-hooks props)

Reply via email to